| 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 f92288fc7cec06f7e72c13b6e5c807c6893d2bba..b6fe1932cac1238587ff4dae3dfc94a8d4352bf3 100644
|
| --- a/pkg/analysis_server/lib/src/generated_protocol.dart
|
| +++ b/pkg/analysis_server/lib/src/generated_protocol.dart
|
| @@ -7540,6 +7540,7 @@ class AnalysisErrorType implements Enum {
|
| * "enableDeferredLoading": optional bool
|
| * "enableEnums": optional bool
|
| * "enableNullAwareOperators": optional bool
|
| + * "enableSuperMixins": optional bool
|
| * "generateDart2jsHints": optional bool
|
| * "generateHints": optional bool
|
| * "generateLints": optional bool
|
| @@ -7554,6 +7555,8 @@ class AnalysisOptions implements HasToJson {
|
|
|
| bool _enableNullAwareOperators;
|
|
|
| + bool _enableSuperMixins;
|
| +
|
| bool _generateDart2jsHints;
|
|
|
| bool _generateHints;
|
| @@ -7629,6 +7632,20 @@ class AnalysisOptions implements HasToJson {
|
| }
|
|
|
| /**
|
| + * True if the client wants to enable spport for the proposed "less
|
| + * restricted mixins" proposal (DEP 34).
|
| + */
|
| + bool get enableSuperMixins => _enableSuperMixins;
|
| +
|
| + /**
|
| + * True if the client wants to enable spport for the proposed "less
|
| + * restricted mixins" proposal (DEP 34).
|
| + */
|
| + void set enableSuperMixins(bool value) {
|
| + this._enableSuperMixins = value;
|
| + }
|
| +
|
| + /**
|
| * True if hints that are specific to dart2js should be generated. This
|
| * option is ignored if generateHints is false.
|
| */
|
| @@ -7670,11 +7687,12 @@ class AnalysisOptions implements HasToJson {
|
| this._generateLints = value;
|
| }
|
|
|
| - AnalysisOptions({bool enableAsync, bool enableDeferredLoading, bool enableEnums, bool enableNullAwareOperators, bool generateDart2jsHints, bool generateHints, bool generateLints}) {
|
| + AnalysisOptions({bool enableAsync, bool enableDeferredLoading, bool enableEnums, bool enableNullAwareOperators, bool enableSuperMixins, bool generateDart2jsHints, bool generateHints, bool generateLints}) {
|
| this.enableAsync = enableAsync;
|
| this.enableDeferredLoading = enableDeferredLoading;
|
| this.enableEnums = enableEnums;
|
| this.enableNullAwareOperators = enableNullAwareOperators;
|
| + this.enableSuperMixins = enableSuperMixins;
|
| this.generateDart2jsHints = generateDart2jsHints;
|
| this.generateHints = generateHints;
|
| this.generateLints = generateLints;
|
| @@ -7701,6 +7719,10 @@ class AnalysisOptions implements HasToJson {
|
| if (json.containsKey("enableNullAwareOperators")) {
|
| enableNullAwareOperators = jsonDecoder._decodeBool(jsonPath + ".enableNullAwareOperators", json["enableNullAwareOperators"]);
|
| }
|
| + bool enableSuperMixins;
|
| + if (json.containsKey("enableSuperMixins")) {
|
| + enableSuperMixins = jsonDecoder._decodeBool(jsonPath + ".enableSuperMixins", json["enableSuperMixins"]);
|
| + }
|
| bool generateDart2jsHints;
|
| if (json.containsKey("generateDart2jsHints")) {
|
| generateDart2jsHints = jsonDecoder._decodeBool(jsonPath + ".generateDart2jsHints", json["generateDart2jsHints"]);
|
| @@ -7713,7 +7735,7 @@ class AnalysisOptions implements HasToJson {
|
| if (json.containsKey("generateLints")) {
|
| generateLints = jsonDecoder._decodeBool(jsonPath + ".generateLints", json["generateLints"]);
|
| }
|
| - return new AnalysisOptions(enableAsync: enableAsync, enableDeferredLoading: enableDeferredLoading, enableEnums: enableEnums, enableNullAwareOperators: enableNullAwareOperators, generateDart2jsHints: generateDart2jsHints, generateHints: generateHints, generateLints: generateLints);
|
| + return new AnalysisOptions(enableAsync: enableAsync, enableDeferredLoading: enableDeferredLoading, enableEnums: enableEnums, enableNullAwareOperators: enableNullAwareOperators, enableSuperMixins: enableSuperMixins, generateDart2jsHints: generateDart2jsHints, generateHints: generateHints, generateLints: generateLints);
|
| } else {
|
| throw jsonDecoder.mismatch(jsonPath, "AnalysisOptions", json);
|
| }
|
| @@ -7733,6 +7755,9 @@ class AnalysisOptions implements HasToJson {
|
| if (enableNullAwareOperators != null) {
|
| result["enableNullAwareOperators"] = enableNullAwareOperators;
|
| }
|
| + if (enableSuperMixins != null) {
|
| + result["enableSuperMixins"] = enableSuperMixins;
|
| + }
|
| if (generateDart2jsHints != null) {
|
| result["generateDart2jsHints"] = generateDart2jsHints;
|
| }
|
| @@ -7755,6 +7780,7 @@ class AnalysisOptions implements HasToJson {
|
| enableDeferredLoading == other.enableDeferredLoading &&
|
| enableEnums == other.enableEnums &&
|
| enableNullAwareOperators == other.enableNullAwareOperators &&
|
| + enableSuperMixins == other.enableSuperMixins &&
|
| generateDart2jsHints == other.generateDart2jsHints &&
|
| generateHints == other.generateHints &&
|
| generateLints == other.generateLints;
|
| @@ -7769,6 +7795,7 @@ class AnalysisOptions implements HasToJson {
|
| hash = _JenkinsSmiHash.combine(hash, enableDeferredLoading.hashCode);
|
| hash = _JenkinsSmiHash.combine(hash, enableEnums.hashCode);
|
| hash = _JenkinsSmiHash.combine(hash, enableNullAwareOperators.hashCode);
|
| + hash = _JenkinsSmiHash.combine(hash, enableSuperMixins.hashCode);
|
| hash = _JenkinsSmiHash.combine(hash, generateDart2jsHints.hashCode);
|
| hash = _JenkinsSmiHash.combine(hash, generateHints.hashCode);
|
| hash = _JenkinsSmiHash.combine(hash, generateLints.hashCode);
|
|
|