Improve error messages for invalid requests

pkg/analysis_server/lib/src/generated_protocol.dart

Index: pkg/analysis_server/lib/src/generated_protocol.dart
diff --git a/pkg/analysis_server/lib/src/generated_protocol.dart b/pkg/analysis_server/lib/src/generated_protocol.dart
index b85b9b841b2d6fbb62449216ca26f24cd66c5575..e58e153758a697fc1e5bc83f8cbbe4f6af1f0d9a 100644
--- a/pkg/analysis_server/lib/src/generated_protocol.dart
+++ b/pkg/analysis_server/lib/src/generated_protocol.dart
@@ -69,7 +69,7 @@ class ServerGetVersionResult implements HasToJson {
       }
       return new ServerGetVersionResult(version);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.getVersion result");
+      throw jsonDecoder.mismatch(jsonPath, "server.getVersion result", json);
     }
   }
 
@@ -189,7 +189,7 @@ class ServerSetSubscriptionsParams implements HasToJson {
       }
       return new ServerSetSubscriptionsParams(subscriptions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.setSubscriptions params");
+      throw jsonDecoder.mismatch(jsonPath, "server.setSubscriptions params", json);
     }
   }
 
@@ -288,7 +288,7 @@ class ServerConnectedParams implements HasToJson {
       }
       return new ServerConnectedParams(version);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.connected params");
+      throw jsonDecoder.mismatch(jsonPath, "server.connected params", json);
     }
   }
 
@@ -416,7 +416,7 @@ class ServerErrorParams implements HasToJson {
       }
       return new ServerErrorParams(isFatal, message, stackTrace);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.error params");
+      throw jsonDecoder.mismatch(jsonPath, "server.error params", json);
     }
   }
 
@@ -521,7 +521,7 @@ class ServerStatusParams implements HasToJson {
       }
       return new ServerStatusParams(analysis: analysis, pub: pub);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "server.status params");
+      throw jsonDecoder.mismatch(jsonPath, "server.status params", json);
     }
   }
 
@@ -606,7 +606,7 @@ class AnalysisGetErrorsParams implements HasToJson {
       }
       return new AnalysisGetErrorsParams(file);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getErrors params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getErrors params", json);
     }
   }
 
@@ -684,7 +684,7 @@ class AnalysisGetErrorsResult implements HasToJson {
       }
       return new AnalysisGetErrorsResult(errors);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getErrors result");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getErrors result", json);
     }
   }
 
@@ -785,7 +785,7 @@ class AnalysisGetHoverParams implements HasToJson {
       }
       return new AnalysisGetHoverParams(file, offset);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getHover params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getHover params", json);
     }
   }
 
@@ -874,7 +874,7 @@ class AnalysisGetHoverResult implements HasToJson {
       }
       return new AnalysisGetHoverResult(hovers);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getHover result");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getHover result", json);
     }
   }
 
@@ -1000,7 +1000,7 @@ class AnalysisGetLibraryDependenciesResult implements HasToJson {
       }
       return new AnalysisGetLibraryDependenciesResult(libraries, packageMap);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getLibraryDependencies result");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getLibraryDependencies result", json);
     }
   }
 
@@ -1131,7 +1131,7 @@ class AnalysisGetNavigationParams implements HasToJson {
       }
       return new AnalysisGetNavigationParams(file, offset, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getNavigation params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getNavigation params", json);
     }
   }
 
@@ -1265,7 +1265,7 @@ class AnalysisGetNavigationResult implements HasToJson {
       }
       return new AnalysisGetNavigationResult(files, targets, regions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.getNavigation result");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.getNavigation result", json);
     }
   }
 
@@ -1346,7 +1346,7 @@ class AnalysisReanalyzeParams implements HasToJson {
       }
       return new AnalysisReanalyzeParams(roots: roots);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.reanalyze params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.reanalyze params", json);
     }
   }
 
@@ -1514,7 +1514,7 @@ class AnalysisSetAnalysisRootsParams implements HasToJson {
       }
       return new AnalysisSetAnalysisRootsParams(included, excluded, packageRoots: packageRoots);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.setAnalysisRoots params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.setAnalysisRoots params", json);
     }
   }
 
@@ -1621,7 +1621,7 @@ class AnalysisSetGeneralSubscriptionsParams implements HasToJson {
       }
       return new AnalysisSetGeneralSubscriptionsParams(subscriptions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.setGeneralSubscriptions params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.setGeneralSubscriptions params", json);
     }
   }
 
@@ -1720,7 +1720,7 @@ class AnalysisSetPriorityFilesParams implements HasToJson {
       }
       return new AnalysisSetPriorityFilesParams(files);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.setPriorityFiles params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.setPriorityFiles params", json);
     }
   }
 
@@ -1821,7 +1821,7 @@ class AnalysisSetSubscriptionsParams implements HasToJson {
       }
       return new AnalysisSetSubscriptionsParams(subscriptions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.setSubscriptions params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.setSubscriptions params", json);
     }
   }
 
@@ -1922,7 +1922,7 @@ class AnalysisUpdateContentParams implements HasToJson {
       }
       return new AnalysisUpdateContentParams(files);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.updateContent params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.updateContent params", json);
     }
   }
 
@@ -1976,7 +1976,7 @@ class AnalysisUpdateContentResult implements HasToJson {
     if (json is Map) {
       return new AnalysisUpdateContentResult();
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.updateContent result");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.updateContent result", json);
     }
   }
 
@@ -2052,7 +2052,7 @@ class AnalysisUpdateOptionsParams implements HasToJson {
       }
       return new AnalysisUpdateOptionsParams(options);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.updateOptions params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.updateOptions params", json);
     }
   }
 
@@ -2151,7 +2151,7 @@ class AnalysisAnalyzedFilesParams implements HasToJson {
       }
       return new AnalysisAnalyzedFilesParams(directories);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.analyzedFiles params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.analyzedFiles params", json);
     }
   }
 
@@ -2252,7 +2252,7 @@ class AnalysisErrorsParams implements HasToJson {
       }
       return new AnalysisErrorsParams(file, errors);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.errors params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.errors params", json);
     }
   }
 
@@ -2333,7 +2333,7 @@ class AnalysisFlushResultsParams implements HasToJson {
       }
       return new AnalysisFlushResultsParams(files);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.flushResults params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.flushResults params", json);
     }
   }
 
@@ -2434,7 +2434,7 @@ class AnalysisFoldingParams implements HasToJson {
       }
       return new AnalysisFoldingParams(file, regions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.folding params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.folding params", json);
     }
   }
 
@@ -2546,7 +2546,7 @@ class AnalysisHighlightsParams implements HasToJson {
       }
       return new AnalysisHighlightsParams(file, regions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.highlights params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.highlights params", json);
     }
   }
 
@@ -2700,7 +2700,7 @@ class AnalysisInvalidateParams implements HasToJson {
       }
       return new AnalysisInvalidateParams(file, offset, length, delta);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.invalidate params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.invalidate params", json);
     }
   }
 
@@ -2872,7 +2872,7 @@ class AnalysisNavigationParams implements HasToJson {
       }
       return new AnalysisNavigationParams(file, regions, targets, files);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.navigation params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.navigation params", json);
     }
   }
 
@@ -2982,7 +2982,7 @@ class AnalysisOccurrencesParams implements HasToJson {
       }
       return new AnalysisOccurrencesParams(file, occurrences);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.occurrences params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.occurrences params", json);
     }
   }
 
@@ -3086,7 +3086,7 @@ class AnalysisOutlineParams implements HasToJson {
       }
       return new AnalysisOutlineParams(file, outline);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.outline params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.outline params", json);
     }
   }
 
@@ -3190,7 +3190,7 @@ class AnalysisOverridesParams implements HasToJson {
       }
       return new AnalysisOverridesParams(file, overrides);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "analysis.overrides params");
+      throw jsonDecoder.mismatch(jsonPath, "analysis.overrides params", json);
     }
   }
 
@@ -3294,7 +3294,7 @@ class CompletionGetSuggestionsParams implements HasToJson {
       }
       return new CompletionGetSuggestionsParams(file, offset);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "completion.getSuggestions params");
+      throw jsonDecoder.mismatch(jsonPath, "completion.getSuggestions params", json);
     }
   }
 
@@ -3375,7 +3375,7 @@ class CompletionGetSuggestionsResult implements HasToJson {
       }
       return new CompletionGetSuggestionsResult(id);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "completion.getSuggestions result");
+      throw jsonDecoder.mismatch(jsonPath, "completion.getSuggestions result", json);
     }
   }
 
@@ -3565,7 +3565,7 @@ class CompletionResultsParams implements HasToJson {
       }
       return new CompletionResultsParams(id, replacementOffset, replacementLength, results, isLast);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "completion.results params");
+      throw jsonDecoder.mismatch(jsonPath, "completion.results params", json);
     }
   }
 
@@ -3705,7 +3705,7 @@ class SearchFindElementReferencesParams implements HasToJson {
       }
       return new SearchFindElementReferencesParams(file, offset, includePotential);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.findElementReferences params");
+      throw jsonDecoder.mismatch(jsonPath, "search.findElementReferences params", json);
     }
   }
 
@@ -3818,7 +3818,7 @@ class SearchFindElementReferencesResult implements HasToJson {
       }
       return new SearchFindElementReferencesResult(id: id, element: element);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.findElementReferences result");
+      throw jsonDecoder.mismatch(jsonPath, "search.findElementReferences result", json);
     }
   }
 
@@ -3903,7 +3903,7 @@ class SearchFindMemberDeclarationsParams implements HasToJson {
       }
       return new SearchFindMemberDeclarationsParams(name);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.findMemberDeclarations params");
+      throw jsonDecoder.mismatch(jsonPath, "search.findMemberDeclarations params", json);
     }
   }
 
@@ -3981,7 +3981,7 @@ class SearchFindMemberDeclarationsResult implements HasToJson {
       }
       return new SearchFindMemberDeclarationsResult(id);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.findMemberDeclarations result");
+      throw jsonDecoder.mismatch(jsonPath, "search.findMemberDeclarations result", json);
     }
   }
 
@@ -4059,7 +4059,7 @@ class SearchFindMemberReferencesParams implements HasToJson {
       }
       return new SearchFindMemberReferencesParams(name);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.findMemberReferences params");
+      throw jsonDecoder.mismatch(jsonPath, "search.findMemberReferences params", json);
     }
   }
 
@@ -4137,7 +4137,7 @@ class SearchFindMemberReferencesResult implements HasToJson {
       }
       return new SearchFindMemberReferencesResult(id);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.findMemberReferences result");
+      throw jsonDecoder.mismatch(jsonPath, "search.findMemberReferences result", json);
     }
   }
 
@@ -4217,7 +4217,7 @@ class SearchFindTopLevelDeclarationsParams implements HasToJson {
       }
       return new SearchFindTopLevelDeclarationsParams(pattern);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.findTopLevelDeclarations params");
+      throw jsonDecoder.mismatch(jsonPath, "search.findTopLevelDeclarations params", json);
     }
   }
 
@@ -4295,7 +4295,7 @@ class SearchFindTopLevelDeclarationsResult implements HasToJson {
       }
       return new SearchFindTopLevelDeclarationsResult(id);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.findTopLevelDeclarations result");
+      throw jsonDecoder.mismatch(jsonPath, "search.findTopLevelDeclarations result", json);
     }
   }
 
@@ -4398,7 +4398,7 @@ class SearchGetTypeHierarchyParams implements HasToJson {
       }
       return new SearchGetTypeHierarchyParams(file, offset);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.getTypeHierarchy params");
+      throw jsonDecoder.mismatch(jsonPath, "search.getTypeHierarchy params", json);
     }
   }
 
@@ -4492,7 +4492,7 @@ class SearchGetTypeHierarchyResult implements HasToJson {
       }
       return new SearchGetTypeHierarchyResult(hierarchyItems: hierarchyItems);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.getTypeHierarchy result");
+      throw jsonDecoder.mismatch(jsonPath, "search.getTypeHierarchy result", json);
     }
   }
 
@@ -4620,7 +4620,7 @@ class SearchResultsParams implements HasToJson {
       }
       return new SearchResultsParams(id, results, isLast);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "search.results params");
+      throw jsonDecoder.mismatch(jsonPath, "search.results params", json);
     }
   }
 
@@ -4770,7 +4770,7 @@ class EditFormatParams implements HasToJson {
       }
       return new EditFormatParams(file, selectionOffset, selectionLength, lineLength: lineLength);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.format params");
+      throw jsonDecoder.mismatch(jsonPath, "edit.format params", json);
     }
   }
 
@@ -4907,7 +4907,7 @@ class EditFormatResult implements HasToJson {
       }
       return new EditFormatResult(edits, selectionOffset, selectionLength);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.format result");
+      throw jsonDecoder.mismatch(jsonPath, "edit.format result", json);
     }
   }
 
@@ -5037,7 +5037,7 @@ class EditGetAssistsParams implements HasToJson {
       }
       return new EditGetAssistsParams(file, offset, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getAssists params");
+      throw jsonDecoder.mismatch(jsonPath, "edit.getAssists params", json);
     }
   }
 
@@ -5121,7 +5121,7 @@ class EditGetAssistsResult implements HasToJson {
       }
       return new EditGetAssistsResult(assists);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getAssists result");
+      throw jsonDecoder.mismatch(jsonPath, "edit.getAssists result", json);
     }
   }
 
@@ -5245,7 +5245,7 @@ class EditGetAvailableRefactoringsParams implements HasToJson {
       }
       return new EditGetAvailableRefactoringsParams(file, offset, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getAvailableRefactorings params");
+      throw jsonDecoder.mismatch(jsonPath, "edit.getAvailableRefactorings params", json);
     }
   }
 
@@ -5329,7 +5329,7 @@ class EditGetAvailableRefactoringsResult implements HasToJson {
       }
       return new EditGetAvailableRefactoringsResult(kinds);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getAvailableRefactorings result");
+      throw jsonDecoder.mismatch(jsonPath, "edit.getAvailableRefactorings result", json);
     }
   }
 
@@ -5430,7 +5430,7 @@ class EditGetFixesParams implements HasToJson {
       }
       return new EditGetFixesParams(file, offset);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getFixes params");
+      throw jsonDecoder.mismatch(jsonPath, "edit.getFixes params", json);
     }
   }
 
@@ -5511,7 +5511,7 @@ class EditGetFixesResult implements HasToJson {
       }
       return new EditGetFixesResult(fixes);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getFixes result");
+      throw jsonDecoder.mismatch(jsonPath, "edit.getFixes result", json);
     }
   }
 
@@ -5711,7 +5711,7 @@ class EditGetRefactoringParams implements HasToJson {
       }
       return new EditGetRefactoringParams(kind, file, offset, length, validateOnly, options: options);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getRefactoring params");
+      throw jsonDecoder.mismatch(jsonPath, "edit.getRefactoring params", json);
     }
   }
 
@@ -5948,7 +5948,7 @@ class EditGetRefactoringResult implements HasToJson {
       }
       return new EditGetRefactoringResult(initialProblems, optionsProblems, finalProblems, feedback: feedback, change: change, potentialEdits: potentialEdits);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.getRefactoring result");
+      throw jsonDecoder.mismatch(jsonPath, "edit.getRefactoring result", json);
     }
   }
 
@@ -6047,7 +6047,7 @@ class EditSortMembersParams implements HasToJson {
       }
       return new EditSortMembersParams(file);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.sortMembers params");
+      throw jsonDecoder.mismatch(jsonPath, "edit.sortMembers params", json);
     }
   }
 
@@ -6127,7 +6127,7 @@ class EditSortMembersResult implements HasToJson {
       }
       return new EditSortMembersResult(edit);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "edit.sortMembers result");
+      throw jsonDecoder.mismatch(jsonPath, "edit.sortMembers result", json);
     }
   }
 
@@ -6207,7 +6207,7 @@ class ExecutionCreateContextParams implements HasToJson {
       }
       return new ExecutionCreateContextParams(contextRoot);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.createContext params");
+      throw jsonDecoder.mismatch(jsonPath, "execution.createContext params", json);
     }
   }
 
@@ -6285,7 +6285,7 @@ class ExecutionCreateContextResult implements HasToJson {
       }
       return new ExecutionCreateContextResult(id);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.createContext result");
+      throw jsonDecoder.mismatch(jsonPath, "execution.createContext result", json);
     }
   }
 
@@ -6363,7 +6363,7 @@ class ExecutionDeleteContextParams implements HasToJson {
       }
       return new ExecutionDeleteContextParams(id);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.deleteContext params");
+      throw jsonDecoder.mismatch(jsonPath, "execution.deleteContext params", json);
     }
   }
 
@@ -6502,7 +6502,7 @@ class ExecutionMapUriParams implements HasToJson {
       }
       return new ExecutionMapUriParams(id, file: file, uri: uri);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.mapUri params");
+      throw jsonDecoder.mismatch(jsonPath, "execution.mapUri params", json);
     }
   }
 
@@ -6611,7 +6611,7 @@ class ExecutionMapUriResult implements HasToJson {
       }
       return new ExecutionMapUriResult(file: file, uri: uri);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.mapUri result");
+      throw jsonDecoder.mismatch(jsonPath, "execution.mapUri result", json);
     }
   }
 
@@ -6696,7 +6696,7 @@ class ExecutionSetSubscriptionsParams implements HasToJson {
       }
       return new ExecutionSetSubscriptionsParams(subscriptions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.setSubscriptions params");
+      throw jsonDecoder.mismatch(jsonPath, "execution.setSubscriptions params", json);
     }
   }
 
@@ -6841,7 +6841,7 @@ class ExecutionLaunchDataParams implements HasToJson {
       }
       return new ExecutionLaunchDataParams(file, kind: kind, referencedFiles: referencedFiles);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "execution.launchData params");
+      throw jsonDecoder.mismatch(jsonPath, "execution.launchData params", json);
     }
   }
 
@@ -6923,7 +6923,7 @@ class AddContentOverlay implements HasToJson {
     }
     if (json is Map) {
       if (json["type"] != "add") {
-        throw jsonDecoder.mismatch(jsonPath, "equal " + "add");
+        throw jsonDecoder.mismatch(jsonPath, "equal " + "add", json);
       }
       String content;
       if (json.containsKey("content")) {
@@ -6933,7 +6933,7 @@ class AddContentOverlay implements HasToJson {
       }
       return new AddContentOverlay(content);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AddContentOverlay");
+      throw jsonDecoder.mismatch(jsonPath, "AddContentOverlay", json);
     }
   }
 
@@ -7099,7 +7099,7 @@ class AnalysisError implements HasToJson {
       }
       return new AnalysisError(severity, type, location, message, correction: correction);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AnalysisError");
+      throw jsonDecoder.mismatch(jsonPath, "AnalysisError", json);
     }
   }
 
@@ -7209,7 +7209,7 @@ class AnalysisErrorFixes implements HasToJson {
       }
       return new AnalysisErrorFixes(error, fixes: fixes);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorFixes");
+      throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorFixes", json);
     }
   }
 
@@ -7286,7 +7286,7 @@ class AnalysisErrorSeverity implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorSeverity");
+    throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorSeverity", json);
   }
 
   @override
@@ -7365,7 +7365,7 @@ class AnalysisErrorType implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorType");
+    throw jsonDecoder.mismatch(jsonPath, "AnalysisErrorType", json);
   }
 
   @override
@@ -7553,7 +7553,7 @@ class AnalysisOptions implements HasToJson {
       }
       return new AnalysisOptions(enableAsync: enableAsync, enableDeferredLoading: enableDeferredLoading, enableEnums: enableEnums, enableNullAwareOperators: enableNullAwareOperators, generateDart2jsHints: generateDart2jsHints, generateHints: generateHints, generateLints: generateLints);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AnalysisOptions");
+      throw jsonDecoder.mismatch(jsonPath, "AnalysisOptions", json);
     }
   }
 
@@ -7683,7 +7683,7 @@ class AnalysisService implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "AnalysisService");
+    throw jsonDecoder.mismatch(jsonPath, "AnalysisService", json);
   }
 
   @override
@@ -7754,7 +7754,7 @@ class AnalysisStatus implements HasToJson {
       }
       return new AnalysisStatus(isAnalyzing, analysisTarget: analysisTarget);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "AnalysisStatus");
+      throw jsonDecoder.mismatch(jsonPath, "AnalysisStatus", json);
     }
   }
 
@@ -7822,7 +7822,7 @@ class ChangeContentOverlay implements HasToJson {
     }
     if (json is Map) {
       if (json["type"] != "change") {
-        throw jsonDecoder.mismatch(jsonPath, "equal " + "change");
+        throw jsonDecoder.mismatch(jsonPath, "equal " + "change", json);
       }
       List<SourceEdit> edits;
       if (json.containsKey("edits")) {
@@ -7832,7 +7832,7 @@ class ChangeContentOverlay implements HasToJson {
       }
       return new ChangeContentOverlay(edits);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "ChangeContentOverlay");
+      throw jsonDecoder.mismatch(jsonPath, "ChangeContentOverlay", json);
     }
   }
 
@@ -8323,7 +8323,7 @@ class CompletionSuggestion implements HasToJson {
       }
       return new CompletionSuggestion(kind, relevance, completion, selectionOffset, selectionLength, isDeprecated, isPotential, docSummary: docSummary, docComplete: docComplete, declaringType: declaringType, element: element, returnType: returnType, parameterNames: parameterNames, parameterTypes: parameterTypes, requiredParameterCount: requiredParameterCount, hasNamedParameters: hasNamedParameters, parameterName: parameterName, parameterType: parameterType, importUri: importUri);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "CompletionSuggestion");
+      throw jsonDecoder.mismatch(jsonPath, "CompletionSuggestion", json);
     }
   }
 
@@ -8527,7 +8527,7 @@ class CompletionSuggestionKind implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "CompletionSuggestionKind");
+    throw jsonDecoder.mismatch(jsonPath, "CompletionSuggestionKind", json);
   }
 
   @override
@@ -8750,7 +8750,7 @@ class Element implements HasToJson {
       }
       return new Element(kind, name, flags, location: location, parameters: parameters, returnType: returnType, typeParameters: typeParameters);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Element");
+      throw jsonDecoder.mismatch(jsonPath, "Element", json);
     }
   }
 
@@ -8952,7 +8952,7 @@ class ElementKind implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "ElementKind");
+    throw jsonDecoder.mismatch(jsonPath, "ElementKind", json);
   }
 
   @override
@@ -9024,7 +9024,7 @@ class ExecutableFile implements HasToJson {
       }
       return new ExecutableFile(file, kind);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "ExecutableFile");
+      throw jsonDecoder.mismatch(jsonPath, "ExecutableFile", json);
     }
   }
 
@@ -9106,7 +9106,7 @@ class ExecutableKind implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "ExecutableKind");
+    throw jsonDecoder.mismatch(jsonPath, "ExecutableKind", json);
   }
 
   @override
@@ -9150,7 +9150,7 @@ class ExecutionService implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "ExecutionService");
+    throw jsonDecoder.mismatch(jsonPath, "ExecutionService", json);
   }
 
   @override
@@ -9214,7 +9214,7 @@ class FoldingKind implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "FoldingKind");
+    throw jsonDecoder.mismatch(jsonPath, "FoldingKind", json);
   }
 
   @override
@@ -9309,7 +9309,7 @@ class FoldingRegion implements HasToJson {
       }
       return new FoldingRegion(kind, offset, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "FoldingRegion");
+      throw jsonDecoder.mismatch(jsonPath, "FoldingRegion", json);
     }
   }
 
@@ -9379,7 +9379,7 @@ class GeneralAnalysisService implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "GeneralAnalysisService");
+    throw jsonDecoder.mismatch(jsonPath, "GeneralAnalysisService", json);
   }
 
   @override
@@ -9474,7 +9474,7 @@ class HighlightRegion implements HasToJson {
       }
       return new HighlightRegion(type, offset, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "HighlightRegion");
+      throw jsonDecoder.mismatch(jsonPath, "HighlightRegion", json);
     }
   }
 
@@ -9729,7 +9729,7 @@ class HighlightRegionType implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "HighlightRegionType");
+    throw jsonDecoder.mismatch(jsonPath, "HighlightRegionType", json);
   }
 
   @override
@@ -10019,7 +10019,7 @@ class HoverInformation implements HasToJson {
       }
       return new HoverInformation(offset, length, containingLibraryPath: containingLibraryPath, containingLibraryName: containingLibraryName, containingClassDescription: containingClassDescription, dartdoc: dartdoc, elementDescription: elementDescription, elementKind: elementKind, parameter: parameter, propagatedType: propagatedType, staticType: staticType);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "HoverInformation");
+      throw jsonDecoder.mismatch(jsonPath, "HoverInformation", json);
     }
   }
 
@@ -10184,7 +10184,7 @@ class LinkedEditGroup implements HasToJson {
       }
       return new LinkedEditGroup(positions, length, suggestions);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "LinkedEditGroup");
+      throw jsonDecoder.mismatch(jsonPath, "LinkedEditGroup", json);
     }
   }
 
@@ -10302,7 +10302,7 @@ class LinkedEditSuggestion implements HasToJson {
       }
       return new LinkedEditSuggestion(value, kind);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "LinkedEditSuggestion");
+      throw jsonDecoder.mismatch(jsonPath, "LinkedEditSuggestion", json);
     }
   }
 
@@ -10384,7 +10384,7 @@ class LinkedEditSuggestionKind implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "LinkedEditSuggestionKind");
+    throw jsonDecoder.mismatch(jsonPath, "LinkedEditSuggestionKind", json);
   }
 
   @override
@@ -10529,7 +10529,7 @@ class Location implements HasToJson {
       }
       return new Location(file, offset, length, startLine, startColumn);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Location");
+      throw jsonDecoder.mismatch(jsonPath, "Location", json);
     }
   }
 
@@ -10660,7 +10660,7 @@ class NavigationRegion implements HasToJson {
       }
       return new NavigationRegion(offset, length, targets);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "NavigationRegion");
+      throw jsonDecoder.mismatch(jsonPath, "NavigationRegion", json);
     }
   }
 
@@ -10856,7 +10856,7 @@ class NavigationTarget implements HasToJson {
       }
       return new NavigationTarget(kind, fileIndex, offset, length, startLine, startColumn);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "NavigationTarget");
+      throw jsonDecoder.mismatch(jsonPath, "NavigationTarget", json);
     }
   }
 
@@ -10986,7 +10986,7 @@ class Occurrences implements HasToJson {
       }
       return new Occurrences(element, offsets, length);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Occurrences");
+      throw jsonDecoder.mismatch(jsonPath, "Occurrences", json);
     }
   }
 
@@ -11135,7 +11135,7 @@ class Outline implements HasToJson {
       }
       return new Outline(element, offset, length, children: children);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Outline");
+      throw jsonDecoder.mismatch(jsonPath, "Outline", json);
     }
   }
 
@@ -11286,7 +11286,7 @@ class Override implements HasToJson {
       }
       return new Override(offset, length, superclassMember: superclassMember, interfaceMembers: interfaceMembers);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Override");
+      throw jsonDecoder.mismatch(jsonPath, "Override", json);
     }
   }
 
@@ -11391,7 +11391,7 @@ class OverriddenMember implements HasToJson {
       }
       return new OverriddenMember(element, className);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "OverriddenMember");
+      throw jsonDecoder.mismatch(jsonPath, "OverriddenMember", json);
     }
   }
 
@@ -11486,7 +11486,7 @@ class Position implements HasToJson {
       }
       return new Position(file, offset);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "Position");
+      throw jsonDecoder.mismatch(jsonPath, "Position", json);
     }
   }
 
@@ -11560,7 +11560,7 @@ class PubStatus implements HasToJson {
       }
       return new PubStatus(isListingPackageDirs);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "PubStatus");
+      throw jsonDecoder.mismatch(jsonPath, "PubStatus", json);
     }
   }
 
@@ -11664,7 +11664,7 @@ class RefactoringKind implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "RefactoringKind");
+    throw jsonDecoder.mismatch(jsonPath, "RefactoringKind", json);
   }
 
   @override
@@ -11807,7 +11807,7 @@ class RefactoringMethodParameter implements HasToJson {
       }
       return new RefactoringMethodParameter(kind, type, name, id: id, parameters: parameters);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "RefactoringMethodParameter");
+      throw jsonDecoder.mismatch(jsonPath, "RefactoringMethodParameter", json);
     }
   }
 
@@ -11969,7 +11969,7 @@ class RefactoringMethodParameterKind implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "RefactoringMethodParameterKind");
+    throw jsonDecoder.mismatch(jsonPath, "RefactoringMethodParameterKind", json);
   }
 
   @override
@@ -12065,7 +12065,7 @@ class RefactoringProblem implements HasToJson {
       }
       return new RefactoringProblem(severity, message, location: location);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "RefactoringProblem");
+      throw jsonDecoder.mismatch(jsonPath, "RefactoringProblem", json);
     }
   }
 
@@ -12152,7 +12152,7 @@ class RefactoringProblemSeverity implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "RefactoringProblemSeverity");
+    throw jsonDecoder.mismatch(jsonPath, "RefactoringProblemSeverity", json);
   }
 
   /**
@@ -12183,11 +12183,11 @@ class RemoveContentOverlay implements HasToJson {
     }
     if (json is Map) {
       if (json["type"] != "remove") {
-        throw jsonDecoder.mismatch(jsonPath, "equal " + "remove");
+        throw jsonDecoder.mismatch(jsonPath, "equal " + "remove", json);
       }
       return new RemoveContentOverlay();
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "RemoveContentOverlay");
+      throw jsonDecoder.mismatch(jsonPath, "RemoveContentOverlay", json);
     }
   }
 
@@ -12301,7 +12301,7 @@ class RequestError implements HasToJson {
       }
       return new RequestError(code, message, stackTrace: stackTrace);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "RequestError");
+      throw jsonDecoder.mismatch(jsonPath, "RequestError", json);
     }
   }
 
@@ -12555,7 +12555,7 @@ class RequestErrorCode implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "RequestErrorCode");
+    throw jsonDecoder.mismatch(jsonPath, "RequestErrorCode", json);
   }
 
   @override
@@ -12683,7 +12683,7 @@ class SearchResult implements HasToJson {
       }
       return new SearchResult(location, kind, isPotential, path);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "SearchResult");
+      throw jsonDecoder.mismatch(jsonPath, "SearchResult", json);
     }
   }
 
@@ -12808,7 +12808,7 @@ class SearchResultKind implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "SearchResultKind");
+    throw jsonDecoder.mismatch(jsonPath, "SearchResultKind", json);
   }
 
   @override
@@ -12852,7 +12852,7 @@ class ServerService implements Enum {
         // Fall through
       }
     }
-    throw jsonDecoder.mismatch(jsonPath, "ServerService");
+    throw jsonDecoder.mismatch(jsonPath, "ServerService", json);
   }
 
   @override
@@ -12977,7 +12977,7 @@ class SourceChange implements HasToJson {
       }
       return new SourceChange(message, edits: edits, linkedEditGroups: linkedEditGroups, selection: selection);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "SourceChange");
+      throw jsonDecoder.mismatch(jsonPath, "SourceChange", json);
     }
   }
 
@@ -13170,7 +13170,7 @@ class SourceEdit implements HasToJson {
       }
       return new SourceEdit(offset, length, replacement, id: id);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "SourceEdit");
+      throw jsonDecoder.mismatch(jsonPath, "SourceEdit", json);
     }
   }
 
@@ -13318,7 +13318,7 @@ class SourceFileEdit implements HasToJson {
       }
       return new SourceFileEdit(file, fileStamp, edits: edits);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "SourceFileEdit");
+      throw jsonDecoder.mismatch(jsonPath, "SourceFileEdit", json);
     }
   }
 
@@ -13567,7 +13567,7 @@ class TypeHierarchyItem implements HasToJson {
       }
       return new TypeHierarchyItem(classElement, displayName: displayName, memberElement: memberElement, superclass: superclass, interfaces: interfaces, mixins: mixins, subclasses: subclasses);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "TypeHierarchyItem");
+      throw jsonDecoder.mismatch(jsonPath, "TypeHierarchyItem", json);
     }
   }
 
@@ -13782,7 +13782,7 @@ class ExtractLocalVariableFeedback extends RefactoringFeedback implements HasToJ
       }
       return new ExtractLocalVariableFeedback(names, offsets, lengths);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "extractLocalVariable feedback");
+      throw jsonDecoder.mismatch(jsonPath, "extractLocalVariable feedback", json);
     }
   }
 
@@ -13886,7 +13886,7 @@ class ExtractLocalVariableOptions extends RefactoringOptions implements HasToJso
       }
       return new ExtractLocalVariableOptions(name, extractAll);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "extractLocalVariable options");
+      throw jsonDecoder.mismatch(jsonPath, "extractLocalVariable options", json);
     }
   }
 
@@ -14138,7 +14138,7 @@ class ExtractMethodFeedback extends RefactoringFeedback implements HasToJson {
       }
       return new ExtractMethodFeedback(offset, length, returnType, names, canCreateGetter, parameters, offsets, lengths);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "extractMethod feedback");
+      throw jsonDecoder.mismatch(jsonPath, "extractMethod feedback", json);
     }
   }
 
@@ -14344,7 +14344,7 @@ class ExtractMethodOptions extends RefactoringOptions implements HasToJson {
       }
       return new ExtractMethodOptions(returnType, createGetter, name, parameters, extractAll);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "extractMethod options");
+      throw jsonDecoder.mismatch(jsonPath, "extractMethod options", json);
     }
   }
 
@@ -14453,7 +14453,7 @@ class InlineLocalVariableFeedback extends RefactoringFeedback implements HasToJs
       }
       return new InlineLocalVariableFeedback(name, occurrences);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "inlineLocalVariable feedback");
+      throw jsonDecoder.mismatch(jsonPath, "inlineLocalVariable feedback", json);
     }
   }
 
@@ -14589,7 +14589,7 @@ class InlineMethodFeedback extends RefactoringFeedback implements HasToJson {
       }
       return new InlineMethodFeedback(methodName, isDeclaration, className: className);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "inlineMethod feedback");
+      throw jsonDecoder.mismatch(jsonPath, "inlineMethod feedback", json);
     }
   }
 
@@ -14693,7 +14693,7 @@ class InlineMethodOptions extends RefactoringOptions implements HasToJson {
       }
       return new InlineMethodOptions(deleteSource, inlineAll);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "inlineMethod options");
+      throw jsonDecoder.mismatch(jsonPath, "inlineMethod options", json);
     }
   }
 
@@ -14787,7 +14787,7 @@ class MoveFileOptions extends RefactoringOptions implements HasToJson {
       }
       return new MoveFileOptions(newFile);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "moveFile options");
+      throw jsonDecoder.mismatch(jsonPath, "moveFile options", json);
     }
   }
 
@@ -14932,7 +14932,7 @@ class RenameFeedback extends RefactoringFeedback implements HasToJson {
       }
       return new RenameFeedback(offset, length, elementKindName, oldName);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "rename feedback");
+      throw jsonDecoder.mismatch(jsonPath, "rename feedback", json);
     }
   }
 
@@ -15010,7 +15010,7 @@ class RenameOptions extends RefactoringOptions implements HasToJson {
       }
       return new RenameOptions(newName);
     } else {
-      throw jsonDecoder.mismatch(jsonPath, "rename options");
+      throw jsonDecoder.mismatch(jsonPath, "rename options", json);
     }
   }