diff --git a/pkg/analysis_server/doc/api.html b/pkg/analysis_server/doc/api.html
index 69a9f879460..707246a6bdf 100644
--- a/pkg/analysis_server/doc/api.html
+++ b/pkg/analysis_server/doc/api.html
@@ -1248,7 +1248,7 @@ dt.typeDefinition {
   }
 }</pre></div>
         <p>
-          Reports the overridding members in a file.
+          Reports the overriding members in a file.
         </p>
         <p>
           This notification is not subscribed to by default. Clients
@@ -2048,7 +2048,7 @@ dt.typeDefinition {
           If directives of the Dart file cannot be organized, for example
           because it has scan or parse errors, or by other reasons,
           <tt>ORGANIZE_DIRECTIVES_ERROR</tt> will be generated. The message
-          will provide datails about the reason.
+          will provide details about the reason.
         </p>
         
         
@@ -2458,7 +2458,7 @@ dt.typeDefinition {
           </dd><dt class="field"><b><i>enableSuperMixins ( <span style="color:#999999">optional</span> bool )</i></b></dt><dd>
             
             <p>
-              True if the client wants to enable spport for the
+              True if the client wants to enable support for the
               proposed "less restricted mixins" proposal (DEP 34).
             </p>
           </dd><dt class="field"><b><i>generateDart2jsHints ( <span style="color:#999999">optional</span> bool )</i></b></dt><dd>
@@ -2776,7 +2776,7 @@ dt.typeDefinition {
           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">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">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>
         <p>
           A description of an executable file.
         </p>
@@ -3030,14 +3030,14 @@ dt.typeDefinition {
       <dl><dt class="field"><b><i>offset ( int )</i></b></dt><dd>
             
             <p>
-              The offset of the range of characters that encompases the
+              The offset of the range of characters that encompasses the
               cursor position and has the same hover information as the
               cursor position.
             </p>
           </dd><dt class="field"><b><i>length ( int )</i></b></dt><dd>
             
             <p>
-              The length of the range of characters that encompases the
+              The length of the range of characters that encompasses the
               cursor position and has the same hover information as the
               cursor position.
             </p>
@@ -3667,7 +3667,7 @@ dt.typeDefinition {
             <p>
               A request was received which the analysis server does
               not recognize, or cannot handle in its current
-              configuation.
+              configuration.
             </p>
           </dd><dt class="value">UNKNOWN_SOURCE</dt><dd>
             
diff --git a/pkg/analysis_server/lib/plugin/protocol/generated_protocol.dart b/pkg/analysis_server/lib/plugin/protocol/generated_protocol.dart
index 4a07f0aebd3..8d4032ef0f8 100644
--- a/pkg/analysis_server/lib/plugin/protocol/generated_protocol.dart
+++ b/pkg/analysis_server/lib/plugin/protocol/generated_protocol.dart
@@ -8058,13 +8058,13 @@ class AnalysisOptions implements HasToJson {
   }
 
   /**
-   * True if the client wants to enable spport for the proposed "less
+   * True if the client wants to enable support 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
+   * True if the client wants to enable support for the proposed "less
    * restricted mixins" proposal (DEP 34).
    */
   void set enableSuperMixins(bool value) {
@@ -9455,6 +9455,7 @@ class Element implements HasToJson {
  *   ENUM
  *   ENUM_CONSTANT
  *   FIELD
+ *   FILE
  *   FUNCTION
  *   FUNCTION_TYPE_ALIAS
  *   GETTER
@@ -9489,6 +9490,8 @@ class ElementKind implements Enum {
 
   static const FIELD = const ElementKind._("FIELD");
 
+  static const FILE = const ElementKind._("FILE");
+
   static const FUNCTION = const ElementKind._("FUNCTION");
 
   static const FUNCTION_TYPE_ALIAS = const ElementKind._("FUNCTION_TYPE_ALIAS");
@@ -9522,7 +9525,7 @@ class ElementKind implements Enum {
   /**
    * A list containing all of the enum values that are defined.
    */
-  static const List<ElementKind> VALUES = const <ElementKind>[CLASS, CLASS_TYPE_ALIAS, COMPILATION_UNIT, CONSTRUCTOR, ENUM, ENUM_CONSTANT, FIELD, FUNCTION, FUNCTION_TYPE_ALIAS, GETTER, LABEL, LIBRARY, LOCAL_VARIABLE, METHOD, PARAMETER, PREFIX, SETTER, TOP_LEVEL_VARIABLE, TYPE_PARAMETER, UNIT_TEST_GROUP, UNIT_TEST_TEST, UNKNOWN];
+  static const List<ElementKind> VALUES = const <ElementKind>[CLASS, CLASS_TYPE_ALIAS, COMPILATION_UNIT, CONSTRUCTOR, ENUM, ENUM_CONSTANT, FIELD, FILE, FUNCTION, FUNCTION_TYPE_ALIAS, GETTER, LABEL, LIBRARY, LOCAL_VARIABLE, METHOD, PARAMETER, PREFIX, SETTER, TOP_LEVEL_VARIABLE, TYPE_PARAMETER, UNIT_TEST_GROUP, UNIT_TEST_TEST, UNKNOWN];
 
   final String name;
 
@@ -9544,6 +9547,8 @@ class ElementKind implements Enum {
         return ENUM_CONSTANT;
       case "FIELD":
         return FIELD;
+      case "FILE":
+        return FILE;
       case "FUNCTION":
         return FUNCTION;
       case "FUNCTION_TYPE_ALIAS":
@@ -10804,13 +10809,13 @@ class HoverInformation implements HasToJson {
   String _staticType;
 
   /**
-   * The offset of the range of characters that encompases the cursor position
+   * The offset of the range of characters that encompasses the cursor position
    * and has the same hover information as the cursor position.
    */
   int get offset => _offset;
 
   /**
-   * The offset of the range of characters that encompases the cursor position
+   * The offset of the range of characters that encompasses the cursor position
    * and has the same hover information as the cursor position.
    */
   void set offset(int value) {
@@ -10819,13 +10824,13 @@ class HoverInformation implements HasToJson {
   }
 
   /**
-   * The length of the range of characters that encompases the cursor position
+   * The length of the range of characters that encompasses the cursor position
    * and has the same hover information as the cursor position.
    */
   int get length => _length;
 
   /**
-   * The length of the range of characters that encompases the cursor position
+   * The length of the range of characters that encompasses the cursor position
    * and has the same hover information as the cursor position.
    */
   void set length(int value) {
@@ -13750,7 +13755,7 @@ class RequestErrorCode implements Enum {
 
   /**
    * A request was received which the analysis server does not recognize, or
-   * cannot handle in its current configuation.
+   * cannot handle in its current configuration.
    */
   static const UNKNOWN_REQUEST = const RequestErrorCode._("UNKNOWN_REQUEST");
 
diff --git a/pkg/analysis_server/test/integration/integration_test_methods.dart b/pkg/analysis_server/test/integration/integration_test_methods.dart
index 18c335760f9..bfe19dd9cc2 100644
--- a/pkg/analysis_server/test/integration/integration_test_methods.dart
+++ b/pkg/analysis_server/test/integration/integration_test_methods.dart
@@ -854,7 +854,7 @@ abstract class IntegrationTestMixin {
   StreamController<AnalysisOutlineParams> _onAnalysisOutline;
 
   /**
-   * Reports the overridding members in a file.
+   * Reports the overriding members in a file.
    *
    * This notification is not subscribed to by default. Clients can subscribe
    * by including the value "OVERRIDES" in the list of services passed in an
@@ -1445,7 +1445,7 @@ abstract class IntegrationTestMixin {
    *
    * If directives of the Dart file cannot be organized, for example because it
    * has scan or parse errors, or by other reasons, ORGANIZE_DIRECTIVES_ERROR
-   * will be generated. The message will provide datails about the reason.
+   * will be generated. The message will provide details about the reason.
    *
    * Parameters
    *
diff --git a/pkg/analysis_server/test/integration/protocol_matchers.dart b/pkg/analysis_server/test/integration/protocol_matchers.dart
index 347976e2d15..6d0ec42bc73 100644
--- a/pkg/analysis_server/test/integration/protocol_matchers.dart
+++ b/pkg/analysis_server/test/integration/protocol_matchers.dart
@@ -1294,6 +1294,7 @@ final Matcher isElement = new LazyMatcher(() => new MatchesJsonObject(
  *   ENUM
  *   ENUM_CONSTANT
  *   FIELD
+ *   FILE
  *   FUNCTION
  *   FUNCTION_TYPE_ALIAS
  *   GETTER
@@ -1319,6 +1320,7 @@ final Matcher isElementKind = new MatchesEnum("ElementKind", [
   "ENUM",
   "ENUM_CONSTANT",
   "FIELD",
+  "FILE",
   "FUNCTION",
   "FUNCTION_TYPE_ALIAS",
   "GETTER",
diff --git a/pkg/analysis_server/tool/spec/generated/java/AnalysisServer.java b/pkg/analysis_server/tool/spec/generated/java/AnalysisServer.java
index 0e2176ae9b8..83223c6d0af 100644
--- a/pkg/analysis_server/tool/spec/generated/java/AnalysisServer.java
+++ b/pkg/analysis_server/tool/spec/generated/java/AnalysisServer.java
@@ -361,7 +361,7 @@ public interface AnalysisServer {
    *
    * If directives of the Dart file cannot be organized, for example because it has scan or parse
    * errors, or by other reasons, ORGANIZE_DIRECTIVES_ERROR will be generated. The message will
-   * provide datails about the reason.
+   * provide details about the reason.
    *
    * @param file The Dart file to organize directives in.
    */
diff --git a/pkg/analysis_server/tool/spec/generated/java/types/AnalysisOptions.java b/pkg/analysis_server/tool/spec/generated/java/types/AnalysisOptions.java
index cefc5111d6e..afdde92cb54 100644
--- a/pkg/analysis_server/tool/spec/generated/java/types/AnalysisOptions.java
+++ b/pkg/analysis_server/tool/spec/generated/java/types/AnalysisOptions.java
@@ -73,7 +73,7 @@ public class AnalysisOptions {
   private final Boolean enableNullAwareOperators;
 
   /**
-   * True if the client wants to enable spport for the proposed "less restricted mixins" proposal
+   * True if the client wants to enable support for the proposed "less restricted mixins" proposal
    * (DEP 34).
    */
   private final Boolean enableSuperMixins;
@@ -186,7 +186,7 @@ public class AnalysisOptions {
   }
 
   /**
-   * True if the client wants to enable spport for the proposed "less restricted mixins" proposal
+   * True if the client wants to enable support for the proposed "less restricted mixins" proposal
    * (DEP 34).
    */
   public Boolean getEnableSuperMixins() {
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 7426bda4466..b84c921d5cd 100644
--- a/pkg/analysis_server/tool/spec/generated/java/types/ElementKind.java
+++ b/pkg/analysis_server/tool/spec/generated/java/types/ElementKind.java
@@ -37,6 +37,8 @@ public class ElementKind {
 
   public static final String FIELD = "FIELD";
 
+  public static final String FILE = "FILE";
+
   public static final String FUNCTION = "FUNCTION";
 
   public static final String FUNCTION_TYPE_ALIAS = "FUNCTION_TYPE_ALIAS";
diff --git a/pkg/analysis_server/tool/spec/generated/java/types/HoverInformation.java b/pkg/analysis_server/tool/spec/generated/java/types/HoverInformation.java
index ac80ee8be2e..c360b6a10b3 100644
--- a/pkg/analysis_server/tool/spec/generated/java/types/HoverInformation.java
+++ b/pkg/analysis_server/tool/spec/generated/java/types/HoverInformation.java
@@ -44,14 +44,14 @@ public class HoverInformation {
   public static final List<HoverInformation> EMPTY_LIST = Lists.newArrayList();
 
   /**
-   * The offset of the range of characters that encompases the cursor position and has the same hover
-   * information as the cursor position.
+   * The offset of the range of characters that encompasses the cursor position and has the same
+   * hover information as the cursor position.
    */
   private final int offset;
 
   /**
-   * The length of the range of characters that encompases the cursor position and has the same hover
-   * information as the cursor position.
+   * The length of the range of characters that encompasses the cursor position and has the same
+   * hover information as the cursor position.
    */
   private final int length;
 
@@ -228,16 +228,16 @@ public class HoverInformation {
   }
 
   /**
-   * The length of the range of characters that encompases the cursor position and has the same hover
-   * information as the cursor position.
+   * The length of the range of characters that encompasses the cursor position and has the same
+   * hover information as the cursor position.
    */
   public int getLength() {
     return length;
   }
 
   /**
-   * The offset of the range of characters that encompases the cursor position and has the same hover
-   * information as the cursor position.
+   * The offset of the range of characters that encompasses the cursor position and has the same
+   * hover information as the cursor position.
    */
   public int getOffset() {
     return offset;
diff --git a/pkg/analysis_server/tool/spec/generated/java/types/RequestErrorCode.java b/pkg/analysis_server/tool/spec/generated/java/types/RequestErrorCode.java
index a8615d28d71..3730a030fc4 100644
--- a/pkg/analysis_server/tool/spec/generated/java/types/RequestErrorCode.java
+++ b/pkg/analysis_server/tool/spec/generated/java/types/RequestErrorCode.java
@@ -135,7 +135,7 @@ public class RequestErrorCode {
 
   /**
    * A request was received which the analysis server does not recognize, or cannot handle in its
-   * current configuation.
+   * current configuration.
    */
   public static final String UNKNOWN_REQUEST = "UNKNOWN_REQUEST";
 
diff --git a/pkg/analysis_server/tool/spec/spec_input.html b/pkg/analysis_server/tool/spec/spec_input.html
index a48d9872594..8c349e32670 100644
--- a/pkg/analysis_server/tool/spec/spec_input.html
+++ b/pkg/analysis_server/tool/spec/spec_input.html
@@ -1071,7 +1071,7 @@
       </notification>
       <notification event="overrides">
         <p>
-          Reports the overridding members in a file.
+          Reports the overriding members in a file.
         </p>
         <p>
           This notification is not subscribed to by default. Clients
@@ -1772,7 +1772,7 @@
           If directives of the Dart file cannot be organized, for example
           because it has scan or parse errors, or by other reasons,
           <tt>ORGANIZE_DIRECTIVES_ERROR</tt> will be generated. The message
-          will provide datails about the reason.
+          will provide details about the reason.
         </p>
         <params>
           <field name="file">
@@ -2131,7 +2131,7 @@
           <field name="enableSuperMixins" optional="true">
             <ref>bool</ref>
             <p>
-              True if the client wants to enable spport for the
+              True if the client wants to enable support for the
               proposed "less restricted mixins" proposal (DEP 34).
             </p>
           </field>
@@ -2521,6 +2521,7 @@
           <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_TYPE_ALIAS</code></value>
           <value><code>GETTER</code></value>
@@ -2906,7 +2907,7 @@
           <field name="offset">
             <ref>int</ref>
             <p>
-              The offset of the range of characters that encompases the
+              The offset of the range of characters that encompasses the
               cursor position and has the same hover information as the
               cursor position.
             </p>
@@ -2914,7 +2915,7 @@
           <field name="length">
             <ref>int</ref>
             <p>
-              The length of the range of characters that encompases the
+              The length of the range of characters that encompasses the
               cursor position and has the same hover information as the
               cursor position.
             </p>
@@ -3693,7 +3694,7 @@
             <p>
               A request was received which the analysis server does
               not recognize, or cannot handle in its current
-              configuation.
+              configuration.
             </p>
           </value>
           <value>