Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: pkg/analysis_server/lib/src/generated_protocol.dart

Issue 1227143003: Update Analysis Server highlight API and implementation. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Split DYNAMIC_VARIABLE, add UNRESOLVED_INSTANCE_MEMBER_REFERENCE. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 9a7d1f2852c1d1a2646ba5916b4404368129d385..f498034cb71393c3f2eedc5b0aeb70905aa08bf6 100644
--- a/pkg/analysis_server/lib/src/generated_protocol.dart
+++ b/pkg/analysis_server/lib/src/generated_protocol.dart
@@ -9296,17 +9296,22 @@ class HighlightRegion implements HasToJson {
* COMMENT_END_OF_LINE
* CONSTRUCTOR
* DIRECTIVE
- * DYNAMIC_TYPE
+ * DYNAMIC_LOCAL_VARIABLE_DECLARATION
+ * DYNAMIC_LOCAL_VARIABLE_REFERENCE
+ * DYNAMIC_PARAMETER_DECLARATION
+ * DYNAMIC_PARAMETER_REFERENCE
* ENUM
* ENUM_CONSTANT
- * FIELD
- * FIELD_STATIC
- * FUNCTION
- * FUNCTION_DECLARATION
* FUNCTION_TYPE_ALIAS
- * GETTER_DECLARATION
* IDENTIFIER_DEFAULT
* IMPORT_PREFIX
+ * INSTANCE_FIELD_DECLARATION
+ * INSTANCE_FIELD_REFERENCE
+ * INSTANCE_GETTER_DECLARATION
+ * INSTANCE_METHOD_DECLARATION
+ * INSTANCE_METHOD_REFERENCE
+ * INSTANCE_SETTER_DECLARATION
+ * INVALID_STRING_ESCAPE
* KEYWORD
* LABEL
* LITERAL_BOOLEAN
@@ -9315,17 +9320,28 @@ class HighlightRegion implements HasToJson {
* LITERAL_LIST
* LITERAL_MAP
* LITERAL_STRING
- * LOCAL_VARIABLE
+ * LOCAL_FUNCTION_DECLARATION
+ * LOCAL_FUNCTION_REFERENCE
* LOCAL_VARIABLE_DECLARATION
- * METHOD
- * METHOD_DECLARATION
- * METHOD_DECLARATION_STATIC
- * METHOD_STATIC
- * PARAMETER
- * SETTER_DECLARATION
- * TOP_LEVEL_VARIABLE
+ * LOCAL_VARIABLE_REFERENCE
+ * PARAMETER_DECLARATION
+ * PARAMETER_REFERENCE
+ * STATIC_FIELD_DECLARATION
+ * STATIC_FIELD_REFERENCE
+ * STATIC_GETTER_DECLARATION
+ * STATIC_METHOD_DECLARATION
+ * STATIC_METHOD_REFERENCE
+ * STATIC_SETTER_DECLARATION
+ * TOP_LEVEL_FUNCTION_DECLARATION
+ * TOP_LEVEL_FUNCTION_REFERENCE
+ * TOP_LEVEL_GETTER_DECLARATION
+ * TOP_LEVEL_SETTER_DECLARATION
+ * TOP_LEVEL_VARIABLE_DECLARATION
+ * TOP_LEVEL_VARIABLE_REFERENCE
* TYPE_NAME_DYNAMIC
* TYPE_PARAMETER
+ * UNRESOLVED_INSTANCE_MEMBER_REFERENCE
+ * VALID_STRING_ESCAPE
* }
*/
class HighlightRegionType implements Enum {
@@ -9345,27 +9361,37 @@ class HighlightRegionType implements Enum {
static const DIRECTIVE = const HighlightRegionType._("DIRECTIVE");
- static const DYNAMIC_TYPE = const HighlightRegionType._("DYNAMIC_TYPE");
+ static const DYNAMIC_LOCAL_VARIABLE_DECLARATION = const HighlightRegionType._("DYNAMIC_LOCAL_VARIABLE_DECLARATION");
+
+ static const DYNAMIC_LOCAL_VARIABLE_REFERENCE = const HighlightRegionType._("DYNAMIC_LOCAL_VARIABLE_REFERENCE");
+
+ static const DYNAMIC_PARAMETER_DECLARATION = const HighlightRegionType._("DYNAMIC_PARAMETER_DECLARATION");
+
+ static const DYNAMIC_PARAMETER_REFERENCE = const HighlightRegionType._("DYNAMIC_PARAMETER_REFERENCE");
static const ENUM = const HighlightRegionType._("ENUM");
static const ENUM_CONSTANT = const HighlightRegionType._("ENUM_CONSTANT");
- static const FIELD = const HighlightRegionType._("FIELD");
+ static const FUNCTION_TYPE_ALIAS = const HighlightRegionType._("FUNCTION_TYPE_ALIAS");
+
+ static const IDENTIFIER_DEFAULT = const HighlightRegionType._("IDENTIFIER_DEFAULT");
- static const FIELD_STATIC = const HighlightRegionType._("FIELD_STATIC");
+ static const IMPORT_PREFIX = const HighlightRegionType._("IMPORT_PREFIX");
- static const FUNCTION = const HighlightRegionType._("FUNCTION");
+ static const INSTANCE_FIELD_DECLARATION = const HighlightRegionType._("INSTANCE_FIELD_DECLARATION");
- static const FUNCTION_DECLARATION = const HighlightRegionType._("FUNCTION_DECLARATION");
+ static const INSTANCE_FIELD_REFERENCE = const HighlightRegionType._("INSTANCE_FIELD_REFERENCE");
- static const FUNCTION_TYPE_ALIAS = const HighlightRegionType._("FUNCTION_TYPE_ALIAS");
+ static const INSTANCE_GETTER_DECLARATION = const HighlightRegionType._("INSTANCE_GETTER_DECLARATION");
- static const GETTER_DECLARATION = const HighlightRegionType._("GETTER_DECLARATION");
+ static const INSTANCE_METHOD_DECLARATION = const HighlightRegionType._("INSTANCE_METHOD_DECLARATION");
- static const IDENTIFIER_DEFAULT = const HighlightRegionType._("IDENTIFIER_DEFAULT");
+ static const INSTANCE_METHOD_REFERENCE = const HighlightRegionType._("INSTANCE_METHOD_REFERENCE");
- static const IMPORT_PREFIX = const HighlightRegionType._("IMPORT_PREFIX");
+ static const INSTANCE_SETTER_DECLARATION = const HighlightRegionType._("INSTANCE_SETTER_DECLARATION");
+
+ static const INVALID_STRING_ESCAPE = const HighlightRegionType._("INVALID_STRING_ESCAPE");
static const KEYWORD = const HighlightRegionType._("KEYWORD");
@@ -9383,32 +9409,54 @@ class HighlightRegionType implements Enum {
static const LITERAL_STRING = const HighlightRegionType._("LITERAL_STRING");
- static const LOCAL_VARIABLE = const HighlightRegionType._("LOCAL_VARIABLE");
+ static const LOCAL_FUNCTION_DECLARATION = const HighlightRegionType._("LOCAL_FUNCTION_DECLARATION");
+
+ static const LOCAL_FUNCTION_REFERENCE = const HighlightRegionType._("LOCAL_FUNCTION_REFERENCE");
static const LOCAL_VARIABLE_DECLARATION = const HighlightRegionType._("LOCAL_VARIABLE_DECLARATION");
- static const METHOD = const HighlightRegionType._("METHOD");
+ static const LOCAL_VARIABLE_REFERENCE = const HighlightRegionType._("LOCAL_VARIABLE_REFERENCE");
+
+ static const PARAMETER_DECLARATION = const HighlightRegionType._("PARAMETER_DECLARATION");
+
+ static const PARAMETER_REFERENCE = const HighlightRegionType._("PARAMETER_REFERENCE");
- static const METHOD_DECLARATION = const HighlightRegionType._("METHOD_DECLARATION");
+ static const STATIC_FIELD_DECLARATION = const HighlightRegionType._("STATIC_FIELD_DECLARATION");
- static const METHOD_DECLARATION_STATIC = const HighlightRegionType._("METHOD_DECLARATION_STATIC");
+ static const STATIC_FIELD_REFERENCE = const HighlightRegionType._("STATIC_FIELD_REFERENCE");
- static const METHOD_STATIC = const HighlightRegionType._("METHOD_STATIC");
+ static const STATIC_GETTER_DECLARATION = const HighlightRegionType._("STATIC_GETTER_DECLARATION");
- static const PARAMETER = const HighlightRegionType._("PARAMETER");
+ static const STATIC_METHOD_DECLARATION = const HighlightRegionType._("STATIC_METHOD_DECLARATION");
- static const SETTER_DECLARATION = const HighlightRegionType._("SETTER_DECLARATION");
+ static const STATIC_METHOD_REFERENCE = const HighlightRegionType._("STATIC_METHOD_REFERENCE");
- static const TOP_LEVEL_VARIABLE = const HighlightRegionType._("TOP_LEVEL_VARIABLE");
+ static const STATIC_SETTER_DECLARATION = const HighlightRegionType._("STATIC_SETTER_DECLARATION");
+
+ static const TOP_LEVEL_FUNCTION_DECLARATION = const HighlightRegionType._("TOP_LEVEL_FUNCTION_DECLARATION");
+
+ static const TOP_LEVEL_FUNCTION_REFERENCE = const HighlightRegionType._("TOP_LEVEL_FUNCTION_REFERENCE");
+
+ static const TOP_LEVEL_GETTER_DECLARATION = const HighlightRegionType._("TOP_LEVEL_GETTER_DECLARATION");
+
+ static const TOP_LEVEL_SETTER_DECLARATION = const HighlightRegionType._("TOP_LEVEL_SETTER_DECLARATION");
+
+ static const TOP_LEVEL_VARIABLE_DECLARATION = const HighlightRegionType._("TOP_LEVEL_VARIABLE_DECLARATION");
+
+ static const TOP_LEVEL_VARIABLE_REFERENCE = const HighlightRegionType._("TOP_LEVEL_VARIABLE_REFERENCE");
static const TYPE_NAME_DYNAMIC = const HighlightRegionType._("TYPE_NAME_DYNAMIC");
static const TYPE_PARAMETER = const HighlightRegionType._("TYPE_PARAMETER");
+ static const UNRESOLVED_INSTANCE_MEMBER_REFERENCE = const HighlightRegionType._("UNRESOLVED_INSTANCE_MEMBER_REFERENCE");
+
+ static const VALID_STRING_ESCAPE = const HighlightRegionType._("VALID_STRING_ESCAPE");
+
/**
* A list containing all of the enum values that are defined.
*/
- static const List<HighlightRegionType> VALUES = const <HighlightRegionType>[ANNOTATION, BUILT_IN, CLASS, COMMENT_BLOCK, COMMENT_DOCUMENTATION, COMMENT_END_OF_LINE, CONSTRUCTOR, DIRECTIVE, DYNAMIC_TYPE, ENUM, ENUM_CONSTANT, FIELD, FIELD_STATIC, FUNCTION, FUNCTION_DECLARATION, FUNCTION_TYPE_ALIAS, GETTER_DECLARATION, IDENTIFIER_DEFAULT, IMPORT_PREFIX, KEYWORD, LABEL, LITERAL_BOOLEAN, LITERAL_DOUBLE, LITERAL_INTEGER, LITERAL_LIST, LITERAL_MAP, LITERAL_STRING, LOCAL_VARIABLE, LOCAL_VARIABLE_DECLARATION, METHOD, METHOD_DECLARATION, METHOD_DECLARATION_STATIC, METHOD_STATIC, PARAMETER, SETTER_DECLARATION, TOP_LEVEL_VARIABLE, TYPE_NAME_DYNAMIC, TYPE_PARAMETER];
+ static const List<HighlightRegionType> VALUES = const <HighlightRegionType>[ANNOTATION, BUILT_IN, CLASS, COMMENT_BLOCK, COMMENT_DOCUMENTATION, COMMENT_END_OF_LINE, CONSTRUCTOR, DIRECTIVE, DYNAMIC_LOCAL_VARIABLE_DECLARATION, DYNAMIC_LOCAL_VARIABLE_REFERENCE, DYNAMIC_PARAMETER_DECLARATION, DYNAMIC_PARAMETER_REFERENCE, ENUM, ENUM_CONSTANT, FUNCTION_TYPE_ALIAS, IDENTIFIER_DEFAULT, IMPORT_PREFIX, INSTANCE_FIELD_DECLARATION, INSTANCE_FIELD_REFERENCE, INSTANCE_GETTER_DECLARATION, INSTANCE_METHOD_DECLARATION, INSTANCE_METHOD_REFERENCE, INSTANCE_SETTER_DECLARATION, INVALID_STRING_ESCAPE, KEYWORD, LABEL, LITERAL_BOOLEAN, LITERAL_DOUBLE, LITERAL_INTEGER, LITERAL_LIST, LITERAL_MAP, LITERAL_STRING, LOCAL_FUNCTION_DECLARATION, LOCAL_FUNCTION_REFERENCE, LOCAL_VARIABLE_DECLARATION, LOCAL_VARIABLE_REFERENCE, PARAMETER_DECLARATION, PARAMETER_REFERENCE, STATIC_FIELD_DECLARATION, STATIC_FIELD_REFERENCE, STATIC_GETTER_DECLARATION, STATIC_METHOD_DECLARATION, STATIC_METHOD_REFERENCE, STATIC_SETTER_DECLARATION, TOP_LEVEL_FUNCTION_DECLARATION, TOP_LEVEL_FUNCTION_REFERENCE, TOP_LEVEL_GETTER_DECLARATION, TOP_LEVEL_SETTER_DECLARATION, TOP_LEVEL_VARIABLE_DECLARATION, TOP_LEVEL_VARIABLE_REFERENCE, TYPE_NAME_DYNAMIC, TYPE_PARAMETER, UNRESOLVED_INSTANCE_MEMBER_REFERENCE, VALID_STRING_ESCAPE];
final String name;
@@ -9432,28 +9480,38 @@ class HighlightRegionType implements Enum {
return CONSTRUCTOR;
case "DIRECTIVE":
return DIRECTIVE;
- case "DYNAMIC_TYPE":
- return DYNAMIC_TYPE;
+ case "DYNAMIC_LOCAL_VARIABLE_DECLARATION":
+ return DYNAMIC_LOCAL_VARIABLE_DECLARATION;
+ case "DYNAMIC_LOCAL_VARIABLE_REFERENCE":
+ return DYNAMIC_LOCAL_VARIABLE_REFERENCE;
+ case "DYNAMIC_PARAMETER_DECLARATION":
+ return DYNAMIC_PARAMETER_DECLARATION;
+ case "DYNAMIC_PARAMETER_REFERENCE":
+ return DYNAMIC_PARAMETER_REFERENCE;
case "ENUM":
return ENUM;
case "ENUM_CONSTANT":
return ENUM_CONSTANT;
- case "FIELD":
- return FIELD;
- case "FIELD_STATIC":
- return FIELD_STATIC;
- case "FUNCTION":
- return FUNCTION;
- case "FUNCTION_DECLARATION":
- return FUNCTION_DECLARATION;
case "FUNCTION_TYPE_ALIAS":
return FUNCTION_TYPE_ALIAS;
- case "GETTER_DECLARATION":
- return GETTER_DECLARATION;
case "IDENTIFIER_DEFAULT":
return IDENTIFIER_DEFAULT;
case "IMPORT_PREFIX":
return IMPORT_PREFIX;
+ case "INSTANCE_FIELD_DECLARATION":
+ return INSTANCE_FIELD_DECLARATION;
+ case "INSTANCE_FIELD_REFERENCE":
+ return INSTANCE_FIELD_REFERENCE;
+ case "INSTANCE_GETTER_DECLARATION":
+ return INSTANCE_GETTER_DECLARATION;
+ case "INSTANCE_METHOD_DECLARATION":
+ return INSTANCE_METHOD_DECLARATION;
+ case "INSTANCE_METHOD_REFERENCE":
+ return INSTANCE_METHOD_REFERENCE;
+ case "INSTANCE_SETTER_DECLARATION":
+ return INSTANCE_SETTER_DECLARATION;
+ case "INVALID_STRING_ESCAPE":
+ return INVALID_STRING_ESCAPE;
case "KEYWORD":
return KEYWORD;
case "LABEL":
@@ -9470,28 +9528,50 @@ class HighlightRegionType implements Enum {
return LITERAL_MAP;
case "LITERAL_STRING":
return LITERAL_STRING;
- case "LOCAL_VARIABLE":
- return LOCAL_VARIABLE;
+ case "LOCAL_FUNCTION_DECLARATION":
+ return LOCAL_FUNCTION_DECLARATION;
+ case "LOCAL_FUNCTION_REFERENCE":
+ return LOCAL_FUNCTION_REFERENCE;
case "LOCAL_VARIABLE_DECLARATION":
return LOCAL_VARIABLE_DECLARATION;
- case "METHOD":
- return METHOD;
- case "METHOD_DECLARATION":
- return METHOD_DECLARATION;
- case "METHOD_DECLARATION_STATIC":
- return METHOD_DECLARATION_STATIC;
- case "METHOD_STATIC":
- return METHOD_STATIC;
- case "PARAMETER":
- return PARAMETER;
- case "SETTER_DECLARATION":
- return SETTER_DECLARATION;
- case "TOP_LEVEL_VARIABLE":
- return TOP_LEVEL_VARIABLE;
+ case "LOCAL_VARIABLE_REFERENCE":
+ return LOCAL_VARIABLE_REFERENCE;
+ case "PARAMETER_DECLARATION":
+ return PARAMETER_DECLARATION;
+ case "PARAMETER_REFERENCE":
+ return PARAMETER_REFERENCE;
+ case "STATIC_FIELD_DECLARATION":
+ return STATIC_FIELD_DECLARATION;
+ case "STATIC_FIELD_REFERENCE":
+ return STATIC_FIELD_REFERENCE;
+ case "STATIC_GETTER_DECLARATION":
+ return STATIC_GETTER_DECLARATION;
+ case "STATIC_METHOD_DECLARATION":
+ return STATIC_METHOD_DECLARATION;
+ case "STATIC_METHOD_REFERENCE":
+ return STATIC_METHOD_REFERENCE;
+ case "STATIC_SETTER_DECLARATION":
+ return STATIC_SETTER_DECLARATION;
+ case "TOP_LEVEL_FUNCTION_DECLARATION":
+ return TOP_LEVEL_FUNCTION_DECLARATION;
+ case "TOP_LEVEL_FUNCTION_REFERENCE":
+ return TOP_LEVEL_FUNCTION_REFERENCE;
+ case "TOP_LEVEL_GETTER_DECLARATION":
+ return TOP_LEVEL_GETTER_DECLARATION;
+ case "TOP_LEVEL_SETTER_DECLARATION":
+ return TOP_LEVEL_SETTER_DECLARATION;
+ case "TOP_LEVEL_VARIABLE_DECLARATION":
+ return TOP_LEVEL_VARIABLE_DECLARATION;
+ case "TOP_LEVEL_VARIABLE_REFERENCE":
+ return TOP_LEVEL_VARIABLE_REFERENCE;
case "TYPE_NAME_DYNAMIC":
return TYPE_NAME_DYNAMIC;
case "TYPE_PARAMETER":
return TYPE_PARAMETER;
+ case "UNRESOLVED_INSTANCE_MEMBER_REFERENCE":
+ return UNRESOLVED_INSTANCE_MEMBER_REFERENCE;
+ case "VALID_STRING_ESCAPE":
+ return VALID_STRING_ESCAPE;
}
throw new Exception('Illegal enum value: $name');
}

Powered by Google App Engine
This is Rietveld 408576698