| Index: pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart
|
| diff --git a/pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart b/pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart
|
| index 0d6e5e219b541c87673ea4a965b9bbf733cd597e..05f51a7e1f98e8414fde3bd6cf00f2f9b3a4c79e 100644
|
| --- a/pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart
|
| +++ b/pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart
|
| @@ -21,11 +21,9 @@ import 'integration_tests.dart';
|
| * "version": String
|
| * }
|
| */
|
| -final Matcher isPluginVersionCheckParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "plugin.versionCheck params", {
|
| - "byteStorePath": isString,
|
| - "version": isString
|
| - }));
|
| +final Matcher isPluginVersionCheckParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("plugin.versionCheck params",
|
| + {"byteStorePath": isString, "version": isString}));
|
|
|
| /**
|
| * plugin.versionCheck result
|
| @@ -38,15 +36,15 @@ final Matcher isPluginVersionCheckParams = new LazyMatcher(() => new MatchesJson
|
| * "interestingFiles": List<String>
|
| * }
|
| */
|
| -final Matcher isPluginVersionCheckResult = new LazyMatcher(() => new MatchesJsonObject(
|
| - "plugin.versionCheck result", {
|
| - "isCompatible": isBool,
|
| - "name": isString,
|
| - "version": isString,
|
| - "interestingFiles": isListOf(isString)
|
| - }, optionalFields: {
|
| - "contactInfo": isString
|
| - }));
|
| +final Matcher isPluginVersionCheckResult =
|
| + new LazyMatcher(() => new MatchesJsonObject("plugin.versionCheck result", {
|
| + "isCompatible": isBool,
|
| + "name": isString,
|
| + "version": isString,
|
| + "interestingFiles": isListOf(isString)
|
| + }, optionalFields: {
|
| + "contactInfo": isString
|
| + }));
|
|
|
| /**
|
| * plugin.shutdown params
|
| @@ -68,11 +66,8 @@ final Matcher isPluginShutdownResult = isNull;
|
| * }
|
| */
|
| final Matcher isPluginErrorParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "plugin.error params", {
|
| - "isFatal": isBool,
|
| - "message": isString,
|
| - "stackTrace": isString
|
| - }));
|
| + "plugin.error params",
|
| + {"isFatal": isBool, "message": isString, "stackTrace": isString}));
|
|
|
| /**
|
| * analysis.handleWatchEvents params
|
| @@ -81,10 +76,9 @@ final Matcher isPluginErrorParams = new LazyMatcher(() => new MatchesJsonObject(
|
| * "events": List<WatchEvent>
|
| * }
|
| */
|
| -final Matcher isAnalysisHandleWatchEventsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.handleWatchEvents params", {
|
| - "events": isListOf(isWatchEvent)
|
| - }));
|
| +final Matcher isAnalysisHandleWatchEventsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.handleWatchEvents params",
|
| + {"events": isListOf(isWatchEvent)}));
|
|
|
| /**
|
| * analysis.handleWatchEvents result
|
| @@ -98,10 +92,9 @@ final Matcher isAnalysisHandleWatchEventsResult = isNull;
|
| * "roots": optional List<FilePath>
|
| * }
|
| */
|
| -final Matcher isAnalysisReanalyzeParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.reanalyze params", null, optionalFields: {
|
| - "roots": isListOf(isFilePath)
|
| - }));
|
| +final Matcher isAnalysisReanalyzeParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.reanalyze params", null,
|
| + optionalFields: {"roots": isListOf(isFilePath)}));
|
|
|
| /**
|
| * analysis.reanalyze result
|
| @@ -115,10 +108,9 @@ final Matcher isAnalysisReanalyzeResult = isNull;
|
| * "options": ContextBuilderOptions
|
| * }
|
| */
|
| -final Matcher isAnalysisSetContextBuilderOptionsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.setContextBuilderOptions params", {
|
| - "options": isContextBuilderOptions
|
| - }));
|
| +final Matcher isAnalysisSetContextBuilderOptionsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.setContextBuilderOptions params",
|
| + {"options": isContextBuilderOptions}));
|
|
|
| /**
|
| * analysis.setContextBuilderOptions result
|
| @@ -132,10 +124,9 @@ final Matcher isAnalysisSetContextBuilderOptionsResult = isNull;
|
| * "roots": List<ContextRoot>
|
| * }
|
| */
|
| -final Matcher isAnalysisSetContextRootsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.setContextRoots params", {
|
| - "roots": isListOf(isContextRoot)
|
| - }));
|
| +final Matcher isAnalysisSetContextRootsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject(
|
| + "analysis.setContextRoots params", {"roots": isListOf(isContextRoot)}));
|
|
|
| /**
|
| * analysis.setContextRoots result
|
| @@ -149,10 +140,9 @@ final Matcher isAnalysisSetContextRootsResult = isNull;
|
| * "files": List<FilePath>
|
| * }
|
| */
|
| -final Matcher isAnalysisSetPriorityFilesParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.setPriorityFiles params", {
|
| - "files": isListOf(isFilePath)
|
| - }));
|
| +final Matcher isAnalysisSetPriorityFilesParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject(
|
| + "analysis.setPriorityFiles params", {"files": isListOf(isFilePath)}));
|
|
|
| /**
|
| * analysis.setPriorityFiles result
|
| @@ -166,10 +156,9 @@ final Matcher isAnalysisSetPriorityFilesResult = isNull;
|
| * "subscriptions": Map<AnalysisService, List<FilePath>>
|
| * }
|
| */
|
| -final Matcher isAnalysisSetSubscriptionsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.setSubscriptions params", {
|
| - "subscriptions": isMapOf(isAnalysisService, isListOf(isFilePath))
|
| - }));
|
| +final Matcher isAnalysisSetSubscriptionsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.setSubscriptions params",
|
| + {"subscriptions": isMapOf(isAnalysisService, isListOf(isFilePath))}));
|
|
|
| /**
|
| * analysis.setSubscriptions result
|
| @@ -183,10 +172,16 @@ final Matcher isAnalysisSetSubscriptionsResult = isNull;
|
| * "files": Map<FilePath, AddContentOverlay | ChangeContentOverlay | RemoveContentOverlay>
|
| * }
|
| */
|
| -final Matcher isAnalysisUpdateContentParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.updateContent params", {
|
| - "files": isMapOf(isFilePath, isOneOf([isAddContentOverlay, isChangeContentOverlay, isRemoveContentOverlay]))
|
| - }));
|
| +final Matcher isAnalysisUpdateContentParams = new LazyMatcher(
|
| + () => new MatchesJsonObject("analysis.updateContent params", {
|
| + "files": isMapOf(
|
| + isFilePath,
|
| + isOneOf([
|
| + isAddContentOverlay,
|
| + isChangeContentOverlay,
|
| + isRemoveContentOverlay
|
| + ]))
|
| + }));
|
|
|
| /**
|
| * analysis.updateContent result
|
| @@ -201,11 +196,9 @@ final Matcher isAnalysisUpdateContentResult = isNull;
|
| * "errors": List<AnalysisError>
|
| * }
|
| */
|
| -final Matcher isAnalysisErrorsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.errors params", {
|
| - "file": isFilePath,
|
| - "errors": isListOf(isAnalysisError)
|
| - }));
|
| +final Matcher isAnalysisErrorsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.errors params",
|
| + {"file": isFilePath, "errors": isListOf(isAnalysisError)}));
|
|
|
| /**
|
| * analysis.folding params
|
| @@ -215,11 +208,9 @@ final Matcher isAnalysisErrorsParams = new LazyMatcher(() => new MatchesJsonObje
|
| * "regions": List<FoldingRegion>
|
| * }
|
| */
|
| -final Matcher isAnalysisFoldingParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.folding params", {
|
| - "file": isFilePath,
|
| - "regions": isListOf(isFoldingRegion)
|
| - }));
|
| +final Matcher isAnalysisFoldingParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.folding params",
|
| + {"file": isFilePath, "regions": isListOf(isFoldingRegion)}));
|
|
|
| /**
|
| * analysis.highlights params
|
| @@ -229,11 +220,9 @@ final Matcher isAnalysisFoldingParams = new LazyMatcher(() => new MatchesJsonObj
|
| * "regions": List<HighlightRegion>
|
| * }
|
| */
|
| -final Matcher isAnalysisHighlightsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.highlights params", {
|
| - "file": isFilePath,
|
| - "regions": isListOf(isHighlightRegion)
|
| - }));
|
| +final Matcher isAnalysisHighlightsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.highlights params",
|
| + {"file": isFilePath, "regions": isListOf(isHighlightRegion)}));
|
|
|
| /**
|
| * analysis.navigation params
|
| @@ -245,13 +234,13 @@ final Matcher isAnalysisHighlightsParams = new LazyMatcher(() => new MatchesJson
|
| * "files": List<FilePath>
|
| * }
|
| */
|
| -final Matcher isAnalysisNavigationParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.navigation params", {
|
| - "file": isFilePath,
|
| - "regions": isListOf(isNavigationRegion),
|
| - "targets": isListOf(isNavigationTarget),
|
| - "files": isListOf(isFilePath)
|
| - }));
|
| +final Matcher isAnalysisNavigationParams =
|
| + new LazyMatcher(() => new MatchesJsonObject("analysis.navigation params", {
|
| + "file": isFilePath,
|
| + "regions": isListOf(isNavigationRegion),
|
| + "targets": isListOf(isNavigationTarget),
|
| + "files": isListOf(isFilePath)
|
| + }));
|
|
|
| /**
|
| * analysis.occurrences params
|
| @@ -261,11 +250,9 @@ final Matcher isAnalysisNavigationParams = new LazyMatcher(() => new MatchesJson
|
| * "occurrences": List<Occurrences>
|
| * }
|
| */
|
| -final Matcher isAnalysisOccurrencesParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.occurrences params", {
|
| - "file": isFilePath,
|
| - "occurrences": isListOf(isOccurrences)
|
| - }));
|
| +final Matcher isAnalysisOccurrencesParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.occurrences params",
|
| + {"file": isFilePath, "occurrences": isListOf(isOccurrences)}));
|
|
|
| /**
|
| * analysis.outline params
|
| @@ -275,11 +262,9 @@ final Matcher isAnalysisOccurrencesParams = new LazyMatcher(() => new MatchesJso
|
| * "outline": List<Outline>
|
| * }
|
| */
|
| -final Matcher isAnalysisOutlineParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "analysis.outline params", {
|
| - "file": isFilePath,
|
| - "outline": isListOf(isOutline)
|
| - }));
|
| +final Matcher isAnalysisOutlineParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("analysis.outline params",
|
| + {"file": isFilePath, "outline": isListOf(isOutline)}));
|
|
|
| /**
|
| * completion.getSuggestions params
|
| @@ -289,11 +274,9 @@ final Matcher isAnalysisOutlineParams = new LazyMatcher(() => new MatchesJsonObj
|
| * "offset": int
|
| * }
|
| */
|
| -final Matcher isCompletionGetSuggestionsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "completion.getSuggestions params", {
|
| - "file": isFilePath,
|
| - "offset": isInt
|
| - }));
|
| +final Matcher isCompletionGetSuggestionsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("completion.getSuggestions params",
|
| + {"file": isFilePath, "offset": isInt}));
|
|
|
| /**
|
| * completion.getSuggestions result
|
| @@ -304,12 +287,12 @@ final Matcher isCompletionGetSuggestionsParams = new LazyMatcher(() => new Match
|
| * "results": List<CompletionSuggestion>
|
| * }
|
| */
|
| -final Matcher isCompletionGetSuggestionsResult = new LazyMatcher(() => new MatchesJsonObject(
|
| - "completion.getSuggestions result", {
|
| - "replacementOffset": isInt,
|
| - "replacementLength": isInt,
|
| - "results": isListOf(isCompletionSuggestion)
|
| - }));
|
| +final Matcher isCompletionGetSuggestionsResult = new LazyMatcher(
|
| + () => new MatchesJsonObject("completion.getSuggestions result", {
|
| + "replacementOffset": isInt,
|
| + "replacementLength": isInt,
|
| + "results": isListOf(isCompletionSuggestion)
|
| + }));
|
|
|
| /**
|
| * edit.getAssists params
|
| @@ -320,12 +303,9 @@ final Matcher isCompletionGetSuggestionsResult = new LazyMatcher(() => new Match
|
| * "length": int
|
| * }
|
| */
|
| -final Matcher isEditGetAssistsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "edit.getAssists params", {
|
| - "file": isFilePath,
|
| - "offset": isInt,
|
| - "length": isInt
|
| - }));
|
| +final Matcher isEditGetAssistsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("edit.getAssists params",
|
| + {"file": isFilePath, "offset": isInt, "length": isInt}));
|
|
|
| /**
|
| * edit.getAssists result
|
| @@ -334,10 +314,9 @@ final Matcher isEditGetAssistsParams = new LazyMatcher(() => new MatchesJsonObje
|
| * "assists": List<PrioritizedSourceChange>
|
| * }
|
| */
|
| -final Matcher isEditGetAssistsResult = new LazyMatcher(() => new MatchesJsonObject(
|
| - "edit.getAssists result", {
|
| - "assists": isListOf(isPrioritizedSourceChange)
|
| - }));
|
| +final Matcher isEditGetAssistsResult = new LazyMatcher(() =>
|
| + new MatchesJsonObject("edit.getAssists result",
|
| + {"assists": isListOf(isPrioritizedSourceChange)}));
|
|
|
| /**
|
| * edit.getAvailableRefactorings params
|
| @@ -348,12 +327,9 @@ final Matcher isEditGetAssistsResult = new LazyMatcher(() => new MatchesJsonObje
|
| * "length": int
|
| * }
|
| */
|
| -final Matcher isEditGetAvailableRefactoringsParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "edit.getAvailableRefactorings params", {
|
| - "file": isFilePath,
|
| - "offset": isInt,
|
| - "length": isInt
|
| - }));
|
| +final Matcher isEditGetAvailableRefactoringsParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject("edit.getAvailableRefactorings params",
|
| + {"file": isFilePath, "offset": isInt, "length": isInt}));
|
|
|
| /**
|
| * edit.getAvailableRefactorings result
|
| @@ -362,10 +338,9 @@ final Matcher isEditGetAvailableRefactoringsParams = new LazyMatcher(() => new M
|
| * "kinds": List<RefactoringKind>
|
| * }
|
| */
|
| -final Matcher isEditGetAvailableRefactoringsResult = new LazyMatcher(() => new MatchesJsonObject(
|
| - "edit.getAvailableRefactorings result", {
|
| - "kinds": isListOf(isRefactoringKind)
|
| - }));
|
| +final Matcher isEditGetAvailableRefactoringsResult = new LazyMatcher(() =>
|
| + new MatchesJsonObject("edit.getAvailableRefactorings result",
|
| + {"kinds": isListOf(isRefactoringKind)}));
|
|
|
| /**
|
| * edit.getFixes params
|
| @@ -375,11 +350,9 @@ final Matcher isEditGetAvailableRefactoringsResult = new LazyMatcher(() => new M
|
| * "offset": int
|
| * }
|
| */
|
| -final Matcher isEditGetFixesParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "edit.getFixes params", {
|
| - "file": isFilePath,
|
| - "offset": isInt
|
| - }));
|
| +final Matcher isEditGetFixesParams = new LazyMatcher(() =>
|
| + new MatchesJsonObject(
|
| + "edit.getFixes params", {"file": isFilePath, "offset": isInt}));
|
|
|
| /**
|
| * edit.getFixes result
|
| @@ -388,10 +361,9 @@ final Matcher isEditGetFixesParams = new LazyMatcher(() => new MatchesJsonObject
|
| * "fixes": List<AnalysisErrorFixes>
|
| * }
|
| */
|
| -final Matcher isEditGetFixesResult = new LazyMatcher(() => new MatchesJsonObject(
|
| - "edit.getFixes result", {
|
| - "fixes": isListOf(isAnalysisErrorFixes)
|
| - }));
|
| +final Matcher isEditGetFixesResult = new LazyMatcher(() =>
|
| + new MatchesJsonObject(
|
| + "edit.getFixes result", {"fixes": isListOf(isAnalysisErrorFixes)}));
|
|
|
| /**
|
| * edit.getRefactoring params
|
| @@ -405,16 +377,16 @@ final Matcher isEditGetFixesResult = new LazyMatcher(() => new MatchesJsonObject
|
| * "options": optional RefactoringOptions
|
| * }
|
| */
|
| -final Matcher isEditGetRefactoringParams = new LazyMatcher(() => new MatchesJsonObject(
|
| - "edit.getRefactoring params", {
|
| - "kind": isRefactoringKind,
|
| - "file": isFilePath,
|
| - "offset": isInt,
|
| - "length": isInt,
|
| - "validateOnly": isBool
|
| - }, optionalFields: {
|
| - "options": isRefactoringOptions
|
| - }));
|
| +final Matcher isEditGetRefactoringParams =
|
| + new LazyMatcher(() => new MatchesJsonObject("edit.getRefactoring params", {
|
| + "kind": isRefactoringKind,
|
| + "file": isFilePath,
|
| + "offset": isInt,
|
| + "length": isInt,
|
| + "validateOnly": isBool
|
| + }, optionalFields: {
|
| + "options": isRefactoringOptions
|
| + }));
|
|
|
| /**
|
| * edit.getRefactoring result
|
| @@ -428,16 +400,16 @@ final Matcher isEditGetRefactoringParams = new LazyMatcher(() => new MatchesJson
|
| * "potentialEdits": optional List<String>
|
| * }
|
| */
|
| -final Matcher isEditGetRefactoringResult = new LazyMatcher(() => new MatchesJsonObject(
|
| - "edit.getRefactoring result", {
|
| - "initialProblems": isListOf(isRefactoringProblem),
|
| - "optionsProblems": isListOf(isRefactoringProblem),
|
| - "finalProblems": isListOf(isRefactoringProblem)
|
| - }, optionalFields: {
|
| - "feedback": isRefactoringFeedback,
|
| - "change": isSourceChange,
|
| - "potentialEdits": isListOf(isString)
|
| - }));
|
| +final Matcher isEditGetRefactoringResult =
|
| + new LazyMatcher(() => new MatchesJsonObject("edit.getRefactoring result", {
|
| + "initialProblems": isListOf(isRefactoringProblem),
|
| + "optionsProblems": isListOf(isRefactoringProblem),
|
| + "finalProblems": isListOf(isRefactoringProblem)
|
| + }, optionalFields: {
|
| + "feedback": isRefactoringFeedback,
|
| + "change": isSourceChange,
|
| + "potentialEdits": isListOf(isString)
|
| + }));
|
|
|
| /**
|
| * AddContentOverlay
|
| @@ -448,10 +420,7 @@ final Matcher isEditGetRefactoringResult = new LazyMatcher(() => new MatchesJson
|
| * }
|
| */
|
| final Matcher isAddContentOverlay = new LazyMatcher(() => new MatchesJsonObject(
|
| - "AddContentOverlay", {
|
| - "type": equals("add"),
|
| - "content": isString
|
| - }));
|
| + "AddContentOverlay", {"type": equals("add"), "content": isString}));
|
|
|
| /**
|
| * AnalysisError
|
| @@ -466,17 +435,17 @@ final Matcher isAddContentOverlay = new LazyMatcher(() => new MatchesJsonObject(
|
| * "hasFix": optional bool
|
| * }
|
| */
|
| -final Matcher isAnalysisError = new LazyMatcher(() => new MatchesJsonObject(
|
| - "AnalysisError", {
|
| - "severity": isAnalysisErrorSeverity,
|
| - "type": isAnalysisErrorType,
|
| - "location": isLocation,
|
| - "message": isString,
|
| - "code": isString
|
| - }, optionalFields: {
|
| - "correction": isString,
|
| - "hasFix": isBool
|
| - }));
|
| +final Matcher isAnalysisError =
|
| + new LazyMatcher(() => new MatchesJsonObject("AnalysisError", {
|
| + "severity": isAnalysisErrorSeverity,
|
| + "type": isAnalysisErrorType,
|
| + "location": isLocation,
|
| + "message": isString,
|
| + "code": isString
|
| + }, optionalFields: {
|
| + "correction": isString,
|
| + "hasFix": isBool
|
| + }));
|
|
|
| /**
|
| * AnalysisErrorFixes
|
| @@ -486,11 +455,11 @@ final Matcher isAnalysisError = new LazyMatcher(() => new MatchesJsonObject(
|
| * "fixes": List<PrioritizedSourceChange>
|
| * }
|
| */
|
| -final Matcher isAnalysisErrorFixes = new LazyMatcher(() => new MatchesJsonObject(
|
| - "AnalysisErrorFixes", {
|
| - "error": isAnalysisError,
|
| - "fixes": isListOf(isPrioritizedSourceChange)
|
| - }));
|
| +final Matcher isAnalysisErrorFixes = new LazyMatcher(() =>
|
| + new MatchesJsonObject("AnalysisErrorFixes", {
|
| + "error": isAnalysisError,
|
| + "fixes": isListOf(isPrioritizedSourceChange)
|
| + }));
|
|
|
| /**
|
| * AnalysisErrorSeverity
|
| @@ -501,11 +470,8 @@ final Matcher isAnalysisErrorFixes = new LazyMatcher(() => new MatchesJsonObject
|
| * ERROR
|
| * }
|
| */
|
| -final Matcher isAnalysisErrorSeverity = new MatchesEnum("AnalysisErrorSeverity", [
|
| - "INFO",
|
| - "WARNING",
|
| - "ERROR"
|
| -]);
|
| +final Matcher isAnalysisErrorSeverity =
|
| + new MatchesEnum("AnalysisErrorSeverity", ["INFO", "WARNING", "ERROR"]);
|
|
|
| /**
|
| * AnalysisErrorType
|
| @@ -543,13 +509,8 @@ final Matcher isAnalysisErrorType = new MatchesEnum("AnalysisErrorType", [
|
| * OUTLINE
|
| * }
|
| */
|
| -final Matcher isAnalysisService = new MatchesEnum("AnalysisService", [
|
| - "FOLDING",
|
| - "HIGHLIGHTS",
|
| - "NAVIGATION",
|
| - "OCCURRENCES",
|
| - "OUTLINE"
|
| -]);
|
| +final Matcher isAnalysisService = new MatchesEnum("AnalysisService",
|
| + ["FOLDING", "HIGHLIGHTS", "NAVIGATION", "OCCURRENCES", "OUTLINE"]);
|
|
|
| /**
|
| * ChangeContentOverlay
|
| @@ -559,11 +520,9 @@ final Matcher isAnalysisService = new MatchesEnum("AnalysisService", [
|
| * "edits": List<SourceEdit>
|
| * }
|
| */
|
| -final Matcher isChangeContentOverlay = new LazyMatcher(() => new MatchesJsonObject(
|
| - "ChangeContentOverlay", {
|
| - "type": equals("change"),
|
| - "edits": isListOf(isSourceEdit)
|
| - }));
|
| +final Matcher isChangeContentOverlay = new LazyMatcher(() =>
|
| + new MatchesJsonObject("ChangeContentOverlay",
|
| + {"type": equals("change"), "edits": isListOf(isSourceEdit)}));
|
|
|
| /**
|
| * CompletionSuggestion
|
| @@ -592,31 +551,31 @@ final Matcher isChangeContentOverlay = new LazyMatcher(() => new MatchesJsonObje
|
| * "importUri": optional String
|
| * }
|
| */
|
| -final Matcher isCompletionSuggestion = new LazyMatcher(() => new MatchesJsonObject(
|
| - "CompletionSuggestion", {
|
| - "kind": isCompletionSuggestionKind,
|
| - "relevance": isInt,
|
| - "completion": isString,
|
| - "selectionOffset": isInt,
|
| - "selectionLength": isInt,
|
| - "isDeprecated": isBool,
|
| - "isPotential": isBool
|
| - }, optionalFields: {
|
| - "docSummary": isString,
|
| - "docComplete": isString,
|
| - "declaringType": isString,
|
| - "defaultArgumentListString": isString,
|
| - "defaultArgumentListTextRanges": isListOf(isInt),
|
| - "element": isElement,
|
| - "returnType": isString,
|
| - "parameterNames": isListOf(isString),
|
| - "parameterTypes": isListOf(isString),
|
| - "requiredParameterCount": isInt,
|
| - "hasNamedParameters": isBool,
|
| - "parameterName": isString,
|
| - "parameterType": isString,
|
| - "importUri": isString
|
| - }));
|
| +final Matcher isCompletionSuggestion =
|
| + new LazyMatcher(() => new MatchesJsonObject("CompletionSuggestion", {
|
| + "kind": isCompletionSuggestionKind,
|
| + "relevance": isInt,
|
| + "completion": isString,
|
| + "selectionOffset": isInt,
|
| + "selectionLength": isInt,
|
| + "isDeprecated": isBool,
|
| + "isPotential": isBool
|
| + }, optionalFields: {
|
| + "docSummary": isString,
|
| + "docComplete": isString,
|
| + "declaringType": isString,
|
| + "defaultArgumentListString": isString,
|
| + "defaultArgumentListTextRanges": isListOf(isInt),
|
| + "element": isElement,
|
| + "returnType": isString,
|
| + "parameterNames": isListOf(isString),
|
| + "parameterTypes": isListOf(isString),
|
| + "requiredParameterCount": isInt,
|
| + "hasNamedParameters": isBool,
|
| + "parameterName": isString,
|
| + "parameterType": isString,
|
| + "importUri": isString
|
| + }));
|
|
|
| /**
|
| * CompletionSuggestionKind
|
| @@ -632,7 +591,8 @@ final Matcher isCompletionSuggestion = new LazyMatcher(() => new MatchesJsonObje
|
| * PARAMETER
|
| * }
|
| */
|
| -final Matcher isCompletionSuggestionKind = new MatchesEnum("CompletionSuggestionKind", [
|
| +final Matcher isCompletionSuggestionKind =
|
| + new MatchesEnum("CompletionSuggestionKind", [
|
| "ARGUMENT_LIST",
|
| "IMPORT",
|
| "IDENTIFIER",
|
| @@ -654,14 +614,14 @@ final Matcher isCompletionSuggestionKind = new MatchesEnum("CompletionSuggestion
|
| * "defaultPackagesDirectoryPath": optional List<String>
|
| * }
|
| */
|
| -final Matcher isContextBuilderOptions = new LazyMatcher(() => new MatchesJsonObject(
|
| - "ContextBuilderOptions", null, optionalFields: {
|
| - "dartSdkSummaryPath": isString,
|
| - "defaultAnalysisOptionsFilePath": isListOf(isString),
|
| - "declaredVariables": isMapOf(isString, isString),
|
| - "defaultPackageFilePath": isListOf(isString),
|
| - "defaultPackagesDirectoryPath": isListOf(isString)
|
| - }));
|
| +final Matcher isContextBuilderOptions = new LazyMatcher(
|
| + () => new MatchesJsonObject("ContextBuilderOptions", null, optionalFields: {
|
| + "dartSdkSummaryPath": isString,
|
| + "defaultAnalysisOptionsFilePath": isListOf(isString),
|
| + "declaredVariables": isMapOf(isString, isString),
|
| + "defaultPackageFilePath": isListOf(isString),
|
| + "defaultPackagesDirectoryPath": isListOf(isString)
|
| + }));
|
|
|
| /**
|
| * ContextRoot
|
| @@ -672,10 +632,7 @@ final Matcher isContextBuilderOptions = new LazyMatcher(() => new MatchesJsonObj
|
| * }
|
| */
|
| final Matcher isContextRoot = new LazyMatcher(() => new MatchesJsonObject(
|
| - "ContextRoot", {
|
| - "root": isString,
|
| - "exclude": isListOf(isString)
|
| - }));
|
| + "ContextRoot", {"root": isString, "exclude": isListOf(isString)}));
|
|
|
| /**
|
| * Element
|
| @@ -690,17 +647,17 @@ final Matcher isContextRoot = new LazyMatcher(() => new MatchesJsonObject(
|
| * "typeParameters": optional String
|
| * }
|
| */
|
| -final Matcher isElement = new LazyMatcher(() => new MatchesJsonObject(
|
| - "Element", {
|
| - "kind": isElementKind,
|
| - "name": isString,
|
| - "flags": isInt
|
| - }, optionalFields: {
|
| - "location": isLocation,
|
| - "parameters": isString,
|
| - "returnType": isString,
|
| - "typeParameters": isString
|
| - }));
|
| +final Matcher isElement =
|
| + new LazyMatcher(() => new MatchesJsonObject("Element", {
|
| + "kind": isElementKind,
|
| + "name": isString,
|
| + "flags": isInt
|
| + }, optionalFields: {
|
| + "location": isLocation,
|
| + "parameters": isString,
|
| + "returnType": isString,
|
| + "typeParameters": isString
|
| + }));
|
|
|
| /**
|
| * ElementKind
|
| @@ -789,11 +746,8 @@ final Matcher isFoldingKind = new MatchesEnum("FoldingKind", [
|
| * }
|
| */
|
| final Matcher isFoldingRegion = new LazyMatcher(() => new MatchesJsonObject(
|
| - "FoldingRegion", {
|
| - "kind": isFoldingKind,
|
| - "offset": isInt,
|
| - "length": isInt
|
| - }));
|
| + "FoldingRegion",
|
| + {"kind": isFoldingKind, "offset": isInt, "length": isInt}));
|
|
|
| /**
|
| * HighlightRegion
|
| @@ -805,11 +759,8 @@ final Matcher isFoldingRegion = new LazyMatcher(() => new MatchesJsonObject(
|
| * }
|
| */
|
| final Matcher isHighlightRegion = new LazyMatcher(() => new MatchesJsonObject(
|
| - "HighlightRegion", {
|
| - "type": isHighlightRegionType,
|
| - "offset": isInt,
|
| - "length": isInt
|
| - }));
|
| + "HighlightRegion",
|
| + {"type": isHighlightRegionType, "offset": isInt, "length": isInt}));
|
|
|
| /**
|
| * HighlightRegionType
|
| @@ -975,12 +926,12 @@ final Matcher isHighlightRegionType = new MatchesEnum("HighlightRegionType", [
|
| * "suggestions": List<LinkedEditSuggestion>
|
| * }
|
| */
|
| -final Matcher isLinkedEditGroup = new LazyMatcher(() => new MatchesJsonObject(
|
| - "LinkedEditGroup", {
|
| - "positions": isListOf(isPosition),
|
| - "length": isInt,
|
| - "suggestions": isListOf(isLinkedEditSuggestion)
|
| - }));
|
| +final Matcher isLinkedEditGroup =
|
| + new LazyMatcher(() => new MatchesJsonObject("LinkedEditGroup", {
|
| + "positions": isListOf(isPosition),
|
| + "length": isInt,
|
| + "suggestions": isListOf(isLinkedEditSuggestion)
|
| + }));
|
|
|
| /**
|
| * LinkedEditSuggestion
|
| @@ -990,11 +941,9 @@ final Matcher isLinkedEditGroup = new LazyMatcher(() => new MatchesJsonObject(
|
| * "kind": LinkedEditSuggestionKind
|
| * }
|
| */
|
| -final Matcher isLinkedEditSuggestion = new LazyMatcher(() => new MatchesJsonObject(
|
| - "LinkedEditSuggestion", {
|
| - "value": isString,
|
| - "kind": isLinkedEditSuggestionKind
|
| - }));
|
| +final Matcher isLinkedEditSuggestion = new LazyMatcher(() =>
|
| + new MatchesJsonObject("LinkedEditSuggestion",
|
| + {"value": isString, "kind": isLinkedEditSuggestionKind}));
|
|
|
| /**
|
| * LinkedEditSuggestionKind
|
| @@ -1006,12 +955,8 @@ final Matcher isLinkedEditSuggestion = new LazyMatcher(() => new MatchesJsonObje
|
| * VARIABLE
|
| * }
|
| */
|
| -final Matcher isLinkedEditSuggestionKind = new MatchesEnum("LinkedEditSuggestionKind", [
|
| - "METHOD",
|
| - "PARAMETER",
|
| - "TYPE",
|
| - "VARIABLE"
|
| -]);
|
| +final Matcher isLinkedEditSuggestionKind = new MatchesEnum(
|
| + "LinkedEditSuggestionKind", ["METHOD", "PARAMETER", "TYPE", "VARIABLE"]);
|
|
|
| /**
|
| * Location
|
| @@ -1024,14 +969,14 @@ final Matcher isLinkedEditSuggestionKind = new MatchesEnum("LinkedEditSuggestion
|
| * "startColumn": int
|
| * }
|
| */
|
| -final Matcher isLocation = new LazyMatcher(() => new MatchesJsonObject(
|
| - "Location", {
|
| - "file": isFilePath,
|
| - "offset": isInt,
|
| - "length": isInt,
|
| - "startLine": isInt,
|
| - "startColumn": isInt
|
| - }));
|
| +final Matcher isLocation =
|
| + new LazyMatcher(() => new MatchesJsonObject("Location", {
|
| + "file": isFilePath,
|
| + "offset": isInt,
|
| + "length": isInt,
|
| + "startLine": isInt,
|
| + "startColumn": isInt
|
| + }));
|
|
|
| /**
|
| * NavigationRegion
|
| @@ -1043,11 +988,8 @@ final Matcher isLocation = new LazyMatcher(() => new MatchesJsonObject(
|
| * }
|
| */
|
| final Matcher isNavigationRegion = new LazyMatcher(() => new MatchesJsonObject(
|
| - "NavigationRegion", {
|
| - "offset": isInt,
|
| - "length": isInt,
|
| - "targets": isListOf(isInt)
|
| - }));
|
| + "NavigationRegion",
|
| + {"offset": isInt, "length": isInt, "targets": isListOf(isInt)}));
|
|
|
| /**
|
| * NavigationTarget
|
| @@ -1061,15 +1003,15 @@ final Matcher isNavigationRegion = new LazyMatcher(() => new MatchesJsonObject(
|
| * "startColumn": int
|
| * }
|
| */
|
| -final Matcher isNavigationTarget = new LazyMatcher(() => new MatchesJsonObject(
|
| - "NavigationTarget", {
|
| - "kind": isElementKind,
|
| - "fileIndex": isInt,
|
| - "offset": isInt,
|
| - "length": isInt,
|
| - "startLine": isInt,
|
| - "startColumn": isInt
|
| - }));
|
| +final Matcher isNavigationTarget =
|
| + new LazyMatcher(() => new MatchesJsonObject("NavigationTarget", {
|
| + "kind": isElementKind,
|
| + "fileIndex": isInt,
|
| + "offset": isInt,
|
| + "length": isInt,
|
| + "startLine": isInt,
|
| + "startColumn": isInt
|
| + }));
|
|
|
| /**
|
| * Occurrences
|
| @@ -1081,11 +1023,8 @@ final Matcher isNavigationTarget = new LazyMatcher(() => new MatchesJsonObject(
|
| * }
|
| */
|
| final Matcher isOccurrences = new LazyMatcher(() => new MatchesJsonObject(
|
| - "Occurrences", {
|
| - "element": isElement,
|
| - "offsets": isListOf(isInt),
|
| - "length": isInt
|
| - }));
|
| + "Occurrences",
|
| + {"element": isElement, "offsets": isListOf(isInt), "length": isInt}));
|
|
|
| /**
|
| * Outline
|
| @@ -1098,13 +1037,8 @@ final Matcher isOccurrences = new LazyMatcher(() => new MatchesJsonObject(
|
| * }
|
| */
|
| final Matcher isOutline = new LazyMatcher(() => new MatchesJsonObject(
|
| - "Outline", {
|
| - "element": isElement,
|
| - "offset": isInt,
|
| - "length": isInt
|
| - }, optionalFields: {
|
| - "children": isListOf(isOutline)
|
| - }));
|
| + "Outline", {"element": isElement, "offset": isInt, "length": isInt},
|
| + optionalFields: {"children": isListOf(isOutline)}));
|
|
|
| /**
|
| * Position
|
| @@ -1114,11 +1048,8 @@ final Matcher isOutline = new LazyMatcher(() => new MatchesJsonObject(
|
| * "offset": int
|
| * }
|
| */
|
| -final Matcher isPosition = new LazyMatcher(() => new MatchesJsonObject(
|
| - "Position", {
|
| - "file": isFilePath,
|
| - "offset": isInt
|
| - }));
|
| +final Matcher isPosition = new LazyMatcher(() =>
|
| + new MatchesJsonObject("Position", {"file": isFilePath, "offset": isInt}));
|
|
|
| /**
|
| * PrioritizedSourceChange
|
| @@ -1128,11 +1059,9 @@ final Matcher isPosition = new LazyMatcher(() => new MatchesJsonObject(
|
| * "change": SourceChange
|
| * }
|
| */
|
| -final Matcher isPrioritizedSourceChange = new LazyMatcher(() => new MatchesJsonObject(
|
| - "PrioritizedSourceChange", {
|
| - "priority": isInt,
|
| - "change": isSourceChange
|
| - }));
|
| +final Matcher isPrioritizedSourceChange = new LazyMatcher(() =>
|
| + new MatchesJsonObject("PrioritizedSourceChange",
|
| + {"priority": isInt, "change": isSourceChange}));
|
|
|
| /**
|
| * RefactoringFeedback
|
| @@ -1140,8 +1069,8 @@ final Matcher isPrioritizedSourceChange = new LazyMatcher(() => new MatchesJsonO
|
| * {
|
| * }
|
| */
|
| -final Matcher isRefactoringFeedback = new LazyMatcher(() => new MatchesJsonObject(
|
| - "RefactoringFeedback", null));
|
| +final Matcher isRefactoringFeedback =
|
| + new LazyMatcher(() => new MatchesJsonObject("RefactoringFeedback", null));
|
|
|
| /**
|
| * RefactoringKind
|
| @@ -1181,15 +1110,15 @@ final Matcher isRefactoringKind = new MatchesEnum("RefactoringKind", [
|
| * "parameters": optional String
|
| * }
|
| */
|
| -final Matcher isRefactoringMethodParameter = new LazyMatcher(() => new MatchesJsonObject(
|
| - "RefactoringMethodParameter", {
|
| - "kind": isRefactoringMethodParameterKind,
|
| - "type": isString,
|
| - "name": isString
|
| - }, optionalFields: {
|
| - "id": isString,
|
| - "parameters": isString
|
| - }));
|
| +final Matcher isRefactoringMethodParameter = new LazyMatcher(() =>
|
| + new MatchesJsonObject("RefactoringMethodParameter", {
|
| + "kind": isRefactoringMethodParameterKind,
|
| + "type": isString,
|
| + "name": isString
|
| + }, optionalFields: {
|
| + "id": isString,
|
| + "parameters": isString
|
| + }));
|
|
|
| /**
|
| * RefactoringOptions
|
| @@ -1197,8 +1126,8 @@ final Matcher isRefactoringMethodParameter = new LazyMatcher(() => new MatchesJs
|
| * {
|
| * }
|
| */
|
| -final Matcher isRefactoringOptions = new LazyMatcher(() => new MatchesJsonObject(
|
| - "RefactoringOptions", null));
|
| +final Matcher isRefactoringOptions =
|
| + new LazyMatcher(() => new MatchesJsonObject("RefactoringOptions", null));
|
|
|
| /**
|
| * RefactoringMethodParameterKind
|
| @@ -1209,11 +1138,8 @@ final Matcher isRefactoringOptions = new LazyMatcher(() => new MatchesJsonObject
|
| * NAMED
|
| * }
|
| */
|
| -final Matcher isRefactoringMethodParameterKind = new MatchesEnum("RefactoringMethodParameterKind", [
|
| - "REQUIRED",
|
| - "POSITIONAL",
|
| - "NAMED"
|
| -]);
|
| +final Matcher isRefactoringMethodParameterKind = new MatchesEnum(
|
| + "RefactoringMethodParameterKind", ["REQUIRED", "POSITIONAL", "NAMED"]);
|
|
|
| /**
|
| * RefactoringProblem
|
| @@ -1224,13 +1150,10 @@ final Matcher isRefactoringMethodParameterKind = new MatchesEnum("RefactoringMet
|
| * "location": optional Location
|
| * }
|
| */
|
| -final Matcher isRefactoringProblem = new LazyMatcher(() => new MatchesJsonObject(
|
| - "RefactoringProblem", {
|
| - "severity": isRefactoringProblemSeverity,
|
| - "message": isString
|
| - }, optionalFields: {
|
| - "location": isLocation
|
| - }));
|
| +final Matcher isRefactoringProblem = new LazyMatcher(() =>
|
| + new MatchesJsonObject("RefactoringProblem",
|
| + {"severity": isRefactoringProblemSeverity, "message": isString},
|
| + optionalFields: {"location": isLocation}));
|
|
|
| /**
|
| * RefactoringProblemSeverity
|
| @@ -1242,12 +1165,8 @@ final Matcher isRefactoringProblem = new LazyMatcher(() => new MatchesJsonObject
|
| * FATAL
|
| * }
|
| */
|
| -final Matcher isRefactoringProblemSeverity = new MatchesEnum("RefactoringProblemSeverity", [
|
| - "INFO",
|
| - "WARNING",
|
| - "ERROR",
|
| - "FATAL"
|
| -]);
|
| +final Matcher isRefactoringProblemSeverity = new MatchesEnum(
|
| + "RefactoringProblemSeverity", ["INFO", "WARNING", "ERROR", "FATAL"]);
|
|
|
| /**
|
| * RemoveContentOverlay
|
| @@ -1256,10 +1175,8 @@ final Matcher isRefactoringProblemSeverity = new MatchesEnum("RefactoringProblem
|
| * "type": "remove"
|
| * }
|
| */
|
| -final Matcher isRemoveContentOverlay = new LazyMatcher(() => new MatchesJsonObject(
|
| - "RemoveContentOverlay", {
|
| - "type": equals("remove")
|
| - }));
|
| +final Matcher isRemoveContentOverlay = new LazyMatcher(() =>
|
| + new MatchesJsonObject("RemoveContentOverlay", {"type": equals("remove")}));
|
|
|
| /**
|
| * RequestError
|
| @@ -1271,12 +1188,8 @@ final Matcher isRemoveContentOverlay = new LazyMatcher(() => new MatchesJsonObje
|
| * }
|
| */
|
| final Matcher isRequestError = new LazyMatcher(() => new MatchesJsonObject(
|
| - "RequestError", {
|
| - "code": isRequestErrorCode,
|
| - "message": isString
|
| - }, optionalFields: {
|
| - "stackTrace": isString
|
| - }));
|
| + "RequestError", {"code": isRequestErrorCode, "message": isString},
|
| + optionalFields: {"stackTrace": isString}));
|
|
|
| /**
|
| * RequestErrorCode
|
| @@ -1305,14 +1218,14 @@ final Matcher isRequestErrorCode = new MatchesEnum("RequestErrorCode", [
|
| * "selection": optional Position
|
| * }
|
| */
|
| -final Matcher isSourceChange = new LazyMatcher(() => new MatchesJsonObject(
|
| - "SourceChange", {
|
| - "message": isString,
|
| - "edits": isListOf(isSourceFileEdit),
|
| - "linkedEditGroups": isListOf(isLinkedEditGroup)
|
| - }, optionalFields: {
|
| - "selection": isPosition
|
| - }));
|
| +final Matcher isSourceChange =
|
| + new LazyMatcher(() => new MatchesJsonObject("SourceChange", {
|
| + "message": isString,
|
| + "edits": isListOf(isSourceFileEdit),
|
| + "linkedEditGroups": isListOf(isLinkedEditGroup)
|
| + }, optionalFields: {
|
| + "selection": isPosition
|
| + }));
|
|
|
| /**
|
| * SourceEdit
|
| @@ -1325,13 +1238,8 @@ final Matcher isSourceChange = new LazyMatcher(() => new MatchesJsonObject(
|
| * }
|
| */
|
| final Matcher isSourceEdit = new LazyMatcher(() => new MatchesJsonObject(
|
| - "SourceEdit", {
|
| - "offset": isInt,
|
| - "length": isInt,
|
| - "replacement": isString
|
| - }, optionalFields: {
|
| - "id": isString
|
| - }));
|
| + "SourceEdit", {"offset": isInt, "length": isInt, "replacement": isString},
|
| + optionalFields: {"id": isString}));
|
|
|
| /**
|
| * SourceFileEdit
|
| @@ -1343,11 +1251,8 @@ final Matcher isSourceEdit = new LazyMatcher(() => new MatchesJsonObject(
|
| * }
|
| */
|
| final Matcher isSourceFileEdit = new LazyMatcher(() => new MatchesJsonObject(
|
| - "SourceFileEdit", {
|
| - "file": isFilePath,
|
| - "fileStamp": isInt,
|
| - "edits": isListOf(isSourceEdit)
|
| - }));
|
| + "SourceFileEdit",
|
| + {"file": isFilePath, "fileStamp": isInt, "edits": isListOf(isSourceEdit)}));
|
|
|
| /**
|
| * WatchEvent
|
| @@ -1358,10 +1263,7 @@ final Matcher isSourceFileEdit = new LazyMatcher(() => new MatchesJsonObject(
|
| * }
|
| */
|
| final Matcher isWatchEvent = new LazyMatcher(() => new MatchesJsonObject(
|
| - "WatchEvent", {
|
| - "type": isWatchEventType,
|
| - "path": isString
|
| - }));
|
| + "WatchEvent", {"type": isWatchEventType, "path": isString}));
|
|
|
| /**
|
| * WatchEventType
|
| @@ -1372,11 +1274,8 @@ final Matcher isWatchEvent = new LazyMatcher(() => new MatchesJsonObject(
|
| * REMOVE
|
| * }
|
| */
|
| -final Matcher isWatchEventType = new MatchesEnum("WatchEventType", [
|
| - "ADD",
|
| - "MODIFY",
|
| - "REMOVE"
|
| -]);
|
| +final Matcher isWatchEventType =
|
| + new MatchesEnum("WatchEventType", ["ADD", "MODIFY", "REMOVE"]);
|
|
|
| /**
|
| * convertGetterToMethod feedback
|
| @@ -1409,15 +1308,15 @@ final Matcher isConvertMethodToGetterOptions = isNull;
|
| * "lengths": List<int>
|
| * }
|
| */
|
| -final Matcher isExtractLocalVariableFeedback = new LazyMatcher(() => new MatchesJsonObject(
|
| - "extractLocalVariable feedback", {
|
| - "names": isListOf(isString),
|
| - "offsets": isListOf(isInt),
|
| - "lengths": isListOf(isInt)
|
| - }, optionalFields: {
|
| - "coveringExpressionOffsets": isListOf(isInt),
|
| - "coveringExpressionLengths": isListOf(isInt)
|
| - }));
|
| +final Matcher isExtractLocalVariableFeedback = new LazyMatcher(
|
| + () => new MatchesJsonObject("extractLocalVariable feedback", {
|
| + "names": isListOf(isString),
|
| + "offsets": isListOf(isInt),
|
| + "lengths": isListOf(isInt)
|
| + }, optionalFields: {
|
| + "coveringExpressionOffsets": isListOf(isInt),
|
| + "coveringExpressionLengths": isListOf(isInt)
|
| + }));
|
|
|
| /**
|
| * extractLocalVariable options
|
| @@ -1427,11 +1326,9 @@ final Matcher isExtractLocalVariableFeedback = new LazyMatcher(() => new Matches
|
| * "extractAll": bool
|
| * }
|
| */
|
| -final Matcher isExtractLocalVariableOptions = new LazyMatcher(() => new MatchesJsonObject(
|
| - "extractLocalVariable options", {
|
| - "name": isString,
|
| - "extractAll": isBool
|
| - }));
|
| +final Matcher isExtractLocalVariableOptions = new LazyMatcher(() =>
|
| + new MatchesJsonObject("extractLocalVariable options",
|
| + {"name": isString, "extractAll": isBool}));
|
|
|
| /**
|
| * extractMethod feedback
|
| @@ -1447,17 +1344,17 @@ final Matcher isExtractLocalVariableOptions = new LazyMatcher(() => new MatchesJ
|
| * "lengths": List<int>
|
| * }
|
| */
|
| -final Matcher isExtractMethodFeedback = new LazyMatcher(() => new MatchesJsonObject(
|
| - "extractMethod feedback", {
|
| - "offset": isInt,
|
| - "length": isInt,
|
| - "returnType": isString,
|
| - "names": isListOf(isString),
|
| - "canCreateGetter": isBool,
|
| - "parameters": isListOf(isRefactoringMethodParameter),
|
| - "offsets": isListOf(isInt),
|
| - "lengths": isListOf(isInt)
|
| - }));
|
| +final Matcher isExtractMethodFeedback =
|
| + new LazyMatcher(() => new MatchesJsonObject("extractMethod feedback", {
|
| + "offset": isInt,
|
| + "length": isInt,
|
| + "returnType": isString,
|
| + "names": isListOf(isString),
|
| + "canCreateGetter": isBool,
|
| + "parameters": isListOf(isRefactoringMethodParameter),
|
| + "offsets": isListOf(isInt),
|
| + "lengths": isListOf(isInt)
|
| + }));
|
|
|
| /**
|
| * extractMethod options
|
| @@ -1470,14 +1367,14 @@ final Matcher isExtractMethodFeedback = new LazyMatcher(() => new MatchesJsonObj
|
| * "extractAll": bool
|
| * }
|
| */
|
| -final Matcher isExtractMethodOptions = new LazyMatcher(() => new MatchesJsonObject(
|
| - "extractMethod options", {
|
| - "returnType": isString,
|
| - "createGetter": isBool,
|
| - "name": isString,
|
| - "parameters": isListOf(isRefactoringMethodParameter),
|
| - "extractAll": isBool
|
| - }));
|
| +final Matcher isExtractMethodOptions =
|
| + new LazyMatcher(() => new MatchesJsonObject("extractMethod options", {
|
| + "returnType": isString,
|
| + "createGetter": isBool,
|
| + "name": isString,
|
| + "parameters": isListOf(isRefactoringMethodParameter),
|
| + "extractAll": isBool
|
| + }));
|
|
|
| /**
|
| * inlineLocalVariable feedback
|
| @@ -1487,11 +1384,9 @@ final Matcher isExtractMethodOptions = new LazyMatcher(() => new MatchesJsonObje
|
| * "occurrences": int
|
| * }
|
| */
|
| -final Matcher isInlineLocalVariableFeedback = new LazyMatcher(() => new MatchesJsonObject(
|
| - "inlineLocalVariable feedback", {
|
| - "name": isString,
|
| - "occurrences": isInt
|
| - }));
|
| +final Matcher isInlineLocalVariableFeedback = new LazyMatcher(() =>
|
| + new MatchesJsonObject("inlineLocalVariable feedback",
|
| + {"name": isString, "occurrences": isInt}));
|
|
|
| /**
|
| * inlineLocalVariable options
|
| @@ -1507,13 +1402,10 @@ final Matcher isInlineLocalVariableOptions = isNull;
|
| * "isDeclaration": bool
|
| * }
|
| */
|
| -final Matcher isInlineMethodFeedback = new LazyMatcher(() => new MatchesJsonObject(
|
| - "inlineMethod feedback", {
|
| - "methodName": isString,
|
| - "isDeclaration": isBool
|
| - }, optionalFields: {
|
| - "className": isString
|
| - }));
|
| +final Matcher isInlineMethodFeedback = new LazyMatcher(() =>
|
| + new MatchesJsonObject("inlineMethod feedback",
|
| + {"methodName": isString, "isDeclaration": isBool},
|
| + optionalFields: {"className": isString}));
|
|
|
| /**
|
| * inlineMethod options
|
| @@ -1523,11 +1415,9 @@ final Matcher isInlineMethodFeedback = new LazyMatcher(() => new MatchesJsonObje
|
| * "inlineAll": bool
|
| * }
|
| */
|
| -final Matcher isInlineMethodOptions = new LazyMatcher(() => new MatchesJsonObject(
|
| - "inlineMethod options", {
|
| - "deleteSource": isBool,
|
| - "inlineAll": isBool
|
| - }));
|
| +final Matcher isInlineMethodOptions = new LazyMatcher(() =>
|
| + new MatchesJsonObject(
|
| + "inlineMethod options", {"deleteSource": isBool, "inlineAll": isBool}));
|
|
|
| /**
|
| * moveFile feedback
|
| @@ -1541,10 +1431,8 @@ final Matcher isMoveFileFeedback = isNull;
|
| * "newFile": FilePath
|
| * }
|
| */
|
| -final Matcher isMoveFileOptions = new LazyMatcher(() => new MatchesJsonObject(
|
| - "moveFile options", {
|
| - "newFile": isFilePath
|
| - }));
|
| +final Matcher isMoveFileOptions = new LazyMatcher(
|
| + () => new MatchesJsonObject("moveFile options", {"newFile": isFilePath}));
|
|
|
| /**
|
| * rename feedback
|
| @@ -1556,13 +1444,13 @@ final Matcher isMoveFileOptions = new LazyMatcher(() => new MatchesJsonObject(
|
| * "oldName": String
|
| * }
|
| */
|
| -final Matcher isRenameFeedback = new LazyMatcher(() => new MatchesJsonObject(
|
| - "rename feedback", {
|
| - "offset": isInt,
|
| - "length": isInt,
|
| - "elementKindName": isString,
|
| - "oldName": isString
|
| - }));
|
| +final Matcher isRenameFeedback =
|
| + new LazyMatcher(() => new MatchesJsonObject("rename feedback", {
|
| + "offset": isInt,
|
| + "length": isInt,
|
| + "elementKindName": isString,
|
| + "oldName": isString
|
| + }));
|
|
|
| /**
|
| * rename options
|
| @@ -1571,8 +1459,5 @@ final Matcher isRenameFeedback = new LazyMatcher(() => new MatchesJsonObject(
|
| * "newName": String
|
| * }
|
| */
|
| -final Matcher isRenameOptions = new LazyMatcher(() => new MatchesJsonObject(
|
| - "rename options", {
|
| - "newName": isString
|
| - }));
|
| -
|
| +final Matcher isRenameOptions = new LazyMatcher(
|
| + () => new MatchesJsonObject("rename options", {"newName": isString}));
|
|
|