From 47a861ca85275da9358443fcab10c48ab780ada9 Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Wed, 18 Oct 2017 19:02:47 +0000
Subject: [PATCH] Add two new element types to the protocol.

Bug:
Change-Id: I5a60081d7c8500590bbabb9ee6dce74fa611b0a3
Reviewed-on: https://dart-review.googlesource.com/14883
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
---
 pkg/analysis_server/doc/api.html                   |  2 +-
 .../integration/support/protocol_matchers.dart     |  4 ++++
 .../spec/generated/java/types/ElementKind.java     |  4 ++++
 pkg/analyzer_plugin/doc/api.html                   |  8 +-------
 .../lib/protocol/protocol_common.dart              | 14 ++++++++++++++
 .../integration/support/protocol_matchers.dart     |  4 ++++
 .../tool/spec/common_types_spec.html               |  2 ++
 7 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/pkg/analysis_server/doc/api.html b/pkg/analysis_server/doc/api.html
index 80fc87b522c..6528f6d2a99 100644
--- a/pkg/analysis_server/doc/api.html
+++ b/pkg/analysis_server/doc/api.html
@@ -3066,7 +3066,7 @@ a:focus, a:hover {
       An enumeration of the kinds of elements.
     </p>
     
-  <dl><dt class="value">CLASS</dt><dt class="value">CLASS_TYPE_ALIAS</dt><dt class="value">COMPILATION_UNIT</dt><dt class="value">CONSTRUCTOR</dt><dt class="value">ENUM</dt><dt class="value">ENUM_CONSTANT</dt><dt class="value">FIELD</dt><dt class="value">FILE</dt><dt class="value">FUNCTION</dt><dt class="value">FUNCTION_TYPE_ALIAS</dt><dt class="value">GETTER</dt><dt class="value">LABEL</dt><dt class="value">LIBRARY</dt><dt class="value">LOCAL_VARIABLE</dt><dt class="value">METHOD</dt><dt class="value">PARAMETER</dt><dt class="value">PREFIX</dt><dt class="value">SETTER</dt><dt class="value">TOP_LEVEL_VARIABLE</dt><dt class="value">TYPE_PARAMETER</dt><dt class="value">UNIT_TEST_GROUP</dt><dt class="value">UNIT_TEST_TEST</dt><dt class="value">UNKNOWN</dt></dl></dd><dt class="typeDefinition"><a name="type_ExecutableFile">ExecutableFile: object</a></dt><dd>
+  <dl><dt class="value">CLASS</dt><dt class="value">CLASS_TYPE_ALIAS</dt><dt class="value">COMPILATION_UNIT</dt><dt class="value">CONSTRUCTOR</dt><dt class="value">CONSTRUCTOR_INVOCATION</dt><dt class="value">ENUM</dt><dt class="value">ENUM_CONSTANT</dt><dt class="value">FIELD</dt><dt class="value">FILE</dt><dt class="value">FUNCTION</dt><dt class="value">FUNCTION_INVOCATION</dt><dt class="value">FUNCTION_TYPE_ALIAS</dt><dt class="value">GETTER</dt><dt class="value">LABEL</dt><dt class="value">LIBRARY</dt><dt class="value">LOCAL_VARIABLE</dt><dt class="value">METHOD</dt><dt class="value">PARAMETER</dt><dt class="value">PREFIX</dt><dt class="value">SETTER</dt><dt class="value">TOP_LEVEL_VARIABLE</dt><dt class="value">TYPE_PARAMETER</dt><dt class="value">UNIT_TEST_GROUP</dt><dt class="value">UNIT_TEST_TEST</dt><dt class="value">UNKNOWN</dt></dl></dd><dt class="typeDefinition"><a name="type_ExecutableFile">ExecutableFile: object</a></dt><dd>
     <p>
       A description of an executable file.
     </p>
diff --git a/pkg/analysis_server/test/integration/support/protocol_matchers.dart b/pkg/analysis_server/test/integration/support/protocol_matchers.dart
index 1429149aa2c..53e4f7c0ae6 100644
--- a/pkg/analysis_server/test/integration/support/protocol_matchers.dart
+++ b/pkg/analysis_server/test/integration/support/protocol_matchers.dart
@@ -326,11 +326,13 @@ final Matcher isElement =
  *   CLASS_TYPE_ALIAS
  *   COMPILATION_UNIT
  *   CONSTRUCTOR
+ *   CONSTRUCTOR_INVOCATION
  *   ENUM
  *   ENUM_CONSTANT
  *   FIELD
  *   FILE
  *   FUNCTION
+ *   FUNCTION_INVOCATION
  *   FUNCTION_TYPE_ALIAS
  *   GETTER
  *   LABEL
@@ -352,11 +354,13 @@ final Matcher isElementKind = new MatchesEnum("ElementKind", [
   "CLASS_TYPE_ALIAS",
   "COMPILATION_UNIT",
   "CONSTRUCTOR",
+  "CONSTRUCTOR_INVOCATION",
   "ENUM",
   "ENUM_CONSTANT",
   "FIELD",
   "FILE",
   "FUNCTION",
+  "FUNCTION_INVOCATION",
   "FUNCTION_TYPE_ALIAS",
   "GETTER",
   "LABEL",
diff --git a/pkg/analysis_server/tool/spec/generated/java/types/ElementKind.java b/pkg/analysis_server/tool/spec/generated/java/types/ElementKind.java
index 14783c3314c..0b9f43894e2 100644
--- a/pkg/analysis_server/tool/spec/generated/java/types/ElementKind.java
+++ b/pkg/analysis_server/tool/spec/generated/java/types/ElementKind.java
@@ -31,6 +31,8 @@ public class ElementKind {
 
   public static final String CONSTRUCTOR = "CONSTRUCTOR";
 
+  public static final String CONSTRUCTOR_INVOCATION = "CONSTRUCTOR_INVOCATION";
+
   public static final String ENUM = "ENUM";
 
   public static final String ENUM_CONSTANT = "ENUM_CONSTANT";
@@ -41,6 +43,8 @@ public class ElementKind {
 
   public static final String FUNCTION = "FUNCTION";
 
+  public static final String FUNCTION_INVOCATION = "FUNCTION_INVOCATION";
+
   public static final String FUNCTION_TYPE_ALIAS = "FUNCTION_TYPE_ALIAS";
 
   public static final String GETTER = "GETTER";
diff --git a/pkg/analyzer_plugin/doc/api.html b/pkg/analyzer_plugin/doc/api.html
index cb83db633c9..7917358ef66 100644
--- a/pkg/analyzer_plugin/doc/api.html
+++ b/pkg/analyzer_plugin/doc/api.html
@@ -1253,13 +1253,7 @@ a:focus, a:hover {
       An enumeration of the kinds of elements.
     </p>
     
-  <dl><dt class="value">CLASS</dt><dt class="value">CLASS_TYPE_ALIAS</dt><dt class="value">COMPILATION_UNIT</dt><dt class="value">CONSTRUCTOR</dt><dt class="value">ENUM</dt><dt class="value">ENUM_CONSTANT</dt><dt class="value">FIELD</dt><dt class="value">FILE</dt><dt class="value">FUNCTION</dt><dt class="value">FUNCTION_TYPE_ALIAS</dt><dt class="value">GETTER</dt><dt class="value">LABEL</dt><dt class="value">LIBRARY</dt><dt class="value">LOCAL_VARIABLE</dt><dt class="value">METHOD</dt><dt class="value">PARAMETER</dt><dt class="value">PREFIX</dt><dt class="value">SETTER</dt><dt class="value">TOP_LEVEL_VARIABLE</dt><dt class="value">TYPE_PARAMETER</dt><dt class="value deprecated">UNIT_TEST_GROUP</dt><dd>
-        
-        <p><b>Deprecated:</b> support for tests was removed.</p>
-      </dd><dt class="value deprecated">UNIT_TEST_TEST</dt><dd>
-        
-        <p><b>Deprecated:</b> support for tests was removed.</p>
-      </dd><dt class="value">UNKNOWN</dt></dl></dd><dt class="typeDefinition"><a name="type_FilePath">FilePath: String</a></dt><dd>
+  <dl><dt class="value">CLASS</dt><dt class="value">CLASS_TYPE_ALIAS</dt><dt class="value">COMPILATION_UNIT</dt><dt class="value">CONSTRUCTOR</dt><dt class="value">CONSTRUCTOR_INVOCATION</dt><dt class="value">ENUM</dt><dt class="value">ENUM_CONSTANT</dt><dt class="value">FIELD</dt><dt class="value">FILE</dt><dt class="value">FUNCTION</dt><dt class="value">FUNCTION_INVOCATION</dt><dt class="value">FUNCTION_TYPE_ALIAS</dt><dt class="value">GETTER</dt><dt class="value">LABEL</dt><dt class="value">LIBRARY</dt><dt class="value">LOCAL_VARIABLE</dt><dt class="value">METHOD</dt><dt class="value">PARAMETER</dt><dt class="value">PREFIX</dt><dt class="value">SETTER</dt><dt class="value">TOP_LEVEL_VARIABLE</dt><dt class="value">TYPE_PARAMETER</dt><dt class="value">UNIT_TEST_GROUP</dt><dt class="value">UNIT_TEST_TEST</dt><dt class="value">UNKNOWN</dt></dl></dd><dt class="typeDefinition"><a name="type_FilePath">FilePath: String</a></dt><dd>
     
     <p>
       The absolute, normalized path of a file.
diff --git a/pkg/analyzer_plugin/lib/protocol/protocol_common.dart b/pkg/analyzer_plugin/lib/protocol/protocol_common.dart
index de2ec8e0cc3..d622ae233a5 100644
--- a/pkg/analyzer_plugin/lib/protocol/protocol_common.dart
+++ b/pkg/analyzer_plugin/lib/protocol/protocol_common.dart
@@ -1721,11 +1721,13 @@ class Element implements HasToJson {
  *   CLASS_TYPE_ALIAS
  *   COMPILATION_UNIT
  *   CONSTRUCTOR
+ *   CONSTRUCTOR_INVOCATION
  *   ENUM
  *   ENUM_CONSTANT
  *   FIELD
  *   FILE
  *   FUNCTION
+ *   FUNCTION_INVOCATION
  *   FUNCTION_TYPE_ALIAS
  *   GETTER
  *   LABEL
@@ -1755,6 +1757,9 @@ class ElementKind implements Enum {
 
   static const ElementKind CONSTRUCTOR = const ElementKind._("CONSTRUCTOR");
 
+  static const ElementKind CONSTRUCTOR_INVOCATION =
+      const ElementKind._("CONSTRUCTOR_INVOCATION");
+
   static const ElementKind ENUM = const ElementKind._("ENUM");
 
   static const ElementKind ENUM_CONSTANT = const ElementKind._("ENUM_CONSTANT");
@@ -1765,6 +1770,9 @@ class ElementKind implements Enum {
 
   static const ElementKind FUNCTION = const ElementKind._("FUNCTION");
 
+  static const ElementKind FUNCTION_INVOCATION =
+      const ElementKind._("FUNCTION_INVOCATION");
+
   static const ElementKind FUNCTION_TYPE_ALIAS =
       const ElementKind._("FUNCTION_TYPE_ALIAS");
 
@@ -1807,11 +1815,13 @@ class ElementKind implements Enum {
     CLASS_TYPE_ALIAS,
     COMPILATION_UNIT,
     CONSTRUCTOR,
+    CONSTRUCTOR_INVOCATION,
     ENUM,
     ENUM_CONSTANT,
     FIELD,
     FILE,
     FUNCTION,
+    FUNCTION_INVOCATION,
     FUNCTION_TYPE_ALIAS,
     GETTER,
     LABEL,
@@ -1843,6 +1853,8 @@ class ElementKind implements Enum {
         return COMPILATION_UNIT;
       case "CONSTRUCTOR":
         return CONSTRUCTOR;
+      case "CONSTRUCTOR_INVOCATION":
+        return CONSTRUCTOR_INVOCATION;
       case "ENUM":
         return ENUM;
       case "ENUM_CONSTANT":
@@ -1853,6 +1865,8 @@ class ElementKind implements Enum {
         return FILE;
       case "FUNCTION":
         return FUNCTION;
+      case "FUNCTION_INVOCATION":
+        return FUNCTION_INVOCATION;
       case "FUNCTION_TYPE_ALIAS":
         return FUNCTION_TYPE_ALIAS;
       case "GETTER":
diff --git a/pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart b/pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart
index f5af9272b54..5953c1c5a1f 100644
--- a/pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart
+++ b/pkg/analyzer_plugin/test/integration/support/protocol_matchers.dart
@@ -251,11 +251,13 @@ final Matcher isElement =
  *   CLASS_TYPE_ALIAS
  *   COMPILATION_UNIT
  *   CONSTRUCTOR
+ *   CONSTRUCTOR_INVOCATION
  *   ENUM
  *   ENUM_CONSTANT
  *   FIELD
  *   FILE
  *   FUNCTION
+ *   FUNCTION_INVOCATION
  *   FUNCTION_TYPE_ALIAS
  *   GETTER
  *   LABEL
@@ -277,11 +279,13 @@ final Matcher isElementKind = new MatchesEnum("ElementKind", [
   "CLASS_TYPE_ALIAS",
   "COMPILATION_UNIT",
   "CONSTRUCTOR",
+  "CONSTRUCTOR_INVOCATION",
   "ENUM",
   "ENUM_CONSTANT",
   "FIELD",
   "FILE",
   "FUNCTION",
+  "FUNCTION_INVOCATION",
   "FUNCTION_TYPE_ALIAS",
   "GETTER",
   "LABEL",
diff --git a/pkg/analyzer_plugin/tool/spec/common_types_spec.html b/pkg/analyzer_plugin/tool/spec/common_types_spec.html
index 7319804c819..1047f8dde91 100644
--- a/pkg/analyzer_plugin/tool/spec/common_types_spec.html
+++ b/pkg/analyzer_plugin/tool/spec/common_types_spec.html
@@ -480,11 +480,13 @@
       <value><code>CLASS_TYPE_ALIAS</code></value>
       <value><code>COMPILATION_UNIT</code></value>
       <value><code>CONSTRUCTOR</code></value>
+      <value><code>CONSTRUCTOR_INVOCATION</code></value>
       <value><code>ENUM</code></value>
       <value><code>ENUM_CONSTANT</code></value>
       <value><code>FIELD</code></value>
       <value><code>FILE</code></value>
       <value><code>FUNCTION</code></value>
+      <value><code>FUNCTION_INVOCATION</code></value>
       <value><code>FUNCTION_TYPE_ALIAS</code></value>
       <value><code>GETTER</code></value>
       <value><code>LABEL</code></value>