languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-19 20:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[analysis_server] Rename LSP Pattern alias to not conflict with Dart Pattern type

Browse source 
Change-Id: Ib3178eb2fd3f3e2d41844d5fb492775da7e3171a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/249487
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Danny Tuppeny 2022-06-22 14:05:24 +00:00 committed by Commit Bot
parent 6651c29779
commit 77bf07a87f
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pkg/analysis_server/lib/lsp_protocol/protocol_generated.dart
View file

@ -84,7 +84,7 @@ typedef DocumentSelector = List<Either2<TextDocumentFilterWithScheme, String>>;
/// The glob pattern. Either a string pattern or a relative pattern.
///
/// @since 3.17.0
typedef GlobPattern = Either2<Pattern, RelativePattern>;
typedef GlobPattern = Either2<LspPattern, RelativePattern>;
/// Inline value information can be provided by different means:
/// - directly as a text value (class InlineValueText).
@ -100,19 +100,6 @@ typedef InlineValue = Either3<InlineValueEvaluatableExpression, InlineValueText,
/// @since 3.17.0
typedef LSPArray = List<LSPAny>;
/// A tagging type for string properties that are actually URIs
///
/// @since 3.16.0
typedef LspUri = String;
/// A notebook document filter denotes a notebook document by different
/// properties. The properties will be match against the notebook's URI (same as
/// with documents)
///
/// @since 3.17.0
typedef NotebookDocumentFilter = Either3<NotebookDocumentFilter1,
NotebookDocumentFilter2, NotebookDocumentFilter3>;
/// The glob pattern to watch relative to the base path. Glob patterns can have
/// the following syntax:
/// - `*` to match one or more characters in a path segment
@ -126,7 +113,20 @@ typedef NotebookDocumentFilter = Either3<NotebookDocumentFilter1,
/// `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
///
/// @since 3.17.0
typedef Pattern = String;
typedef LspPattern = String;
/// A tagging type for string properties that are actually URIs
///
/// @since 3.16.0
typedef LspUri = String;
/// A notebook document filter denotes a notebook document by different
/// properties. The properties will be match against the notebook's URI (same as
/// with documents)
///
/// @since 3.17.0
typedef NotebookDocumentFilter = Either3<NotebookDocumentFilter1,
NotebookDocumentFilter2, NotebookDocumentFilter3>;
typedef PrepareRenameResult
= Either3<PlaceholderAndRange, PrepareRenameResult2, Range>;
typedef ProgressToken = Either2<int, String>;
@ -23298,7 +23298,7 @@ class RelativePattern implements ToJsonable {
final Either2<LspUri, WorkspaceFolder> baseUri;
/// The actual glob pattern;
final Pattern pattern;
final LspPattern pattern;
@override
Map<String, Object?> toJson() {
@ -41631,7 +41631,8 @@ bool _canParseStringRelativePattern(
}
if ((!nullCheck || value != null) &&
(value is! String && !RelativePattern.canParse(value, reporter))) {
reporter.reportError('must be of type Either2<Pattern, RelativePattern>');
reporter
.reportError('must be of type Either2<LspPattern, RelativePattern>');
return false;
}
} finally {
@ -42900,12 +42901,13 @@ Either2<SemanticTokensOptions, SemanticTokensRegistrationOptions>
: throw '$value was not one of (SemanticTokensOptions, SemanticTokensRegistrationOptions)';
}
Either2<Pattern, RelativePattern> _eitherStringRelativePattern(Object? value) {
Either2<LspPattern, RelativePattern> _eitherStringRelativePattern(
Object? value) {
return value is String
? Either2.t1(value)
: RelativePattern.canParse(value, nullLspJsonReporter)
? Either2.t2(RelativePattern.fromJson(value as Map<String, Object?>))
: throw '$value was not one of (Pattern, RelativePattern)';
: throw '$value was not one of (LspPattern, RelativePattern)';
}
Either2<LspUri, WorkspaceFolder> _eitherStringWorkspaceFolder(Object? value) {

1
pkg/analysis_server/tool/lsp_spec/meta_model_cleaner.dart
View file

@ -364,6 +364,7 @@ class LspMetaModelCleaner {
'SignatureInformationParameterInformation',
'TextDocumentFilter2': 'TextDocumentFilterWithScheme',
'PrepareRenameResult1': 'PlaceholderAndRange',
'Pattern': 'LspPattern',
'URI': 'LspUri',
};