diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..65bbf035c
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,34 @@
+{
+	"editor.rulers": [
+		80
+	],
+	"cSpell.words": [
+		"ABAP",
+		"EBNF",
+		"LSIF",
+		"Naur",
+		"RGBA",
+		"Retriggers",
+		"Struct",
+		"Sublime's",
+		"Unregistration",
+		"bibtex",
+		"diagnostic's",
+		"downcase",
+		"hover's",
+		"lightbulbs",
+		"quickfix",
+		"refactorings",
+		"retrigger",
+		"sectionid",
+		"textedit",
+		"transactionally",
+		"uhhhh",
+		"uinteger",
+		"unregister",
+		"unregisterations",
+		"unregistrations",
+		"upcase",
+		"workspaceedit"
+	]
+}
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index ad9333333..fe01f2bdc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,7 +240,7 @@ DEPENDENCIES
   tzinfo-data
 
 RUBY VERSION
-   ruby 2.7.0p0
+   ruby 2.5.1p57
 
 BUNDLED WITH
    2.1.4
diff --git a/_data/specification-3-15-toc.yml b/_data/specification-3-15-toc.yml
index 6e5a3c33c..e541e44a6 100644
--- a/_data/specification-3-15-toc.yml
+++ b/_data/specification-3-15-toc.yml
@@ -63,10 +63,10 @@
       anchor: markupContent
     - title: Work Done Progress
       anchor: workDoneProgress
-    - title: Work Done Progress Params
-      anchor: workDoneProgressParams
-    - title: Work Done Progress Options
-      anchor: workDoneProgressOptions
+    - title: Client Initiated Progress
+      anchor: clientInitiatedProgress
+    - title: Server Initiated Progress
+      anchor: serverInitiatedProgress
     - title: Partial Results
       anchor: partialResults
     - title: Partial Result Params
diff --git a/_data/specification-3-16-toc.yml b/_data/specification-3-16-toc.yml
index 4ded4aecb..7b88261a7 100644
--- a/_data/specification-3-16-toc.yml
+++ b/_data/specification-3-16-toc.yml
@@ -23,6 +23,8 @@
     children:
     - title: URI
       anchor: uri
+    - title: Regular Expression
+      anchor: regExp
     - title: Text Documents
       anchor: textDocuments
     - title: Position
@@ -63,10 +65,10 @@
       anchor: markupContent
     - title: Work Done Progress
       anchor: workDoneProgress
-    - title: Work Done Progress Params
-      anchor: workDoneProgressParams
-    - title: Work Done Progress Options
-      anchor: workDoneProgressOptions
+    - title: Client Initiated Progress
+      anchor: clientInitiatedProgress
+    - title: Server Initiated Progress
+      anchor: serverInitiatedProgress
     - title: Partial Results
       anchor: partialResults
     - title: Partial Result Params
@@ -95,6 +97,8 @@
       anchor: window_showMessage
     - title: showMessageRequest
       anchor: window_showMessageRequest
+    - title: showDocument
+      anchor: window_showDocument
     - title: logMessage
       anchor: window_logMessage
     - title: progress/create
@@ -187,6 +191,8 @@
       anchor: textDocument_codeLens
     - title: codeLens resolve
       anchor: codeLens_resolve
+    - title: codeLens refresh
+      anchor: codeLens_refresh
     - title: documentLink
       anchor: textDocument_documentLink
     - title: documentLink resolve
@@ -217,6 +223,8 @@
       anchor: callHierarchy_outgoingCalls
     - title: semantic tokens
       anchor: textDocument_semanticTokens
+    - title: linkedEditingRange
+      anchor: textDocument_linkedEditingRange
     - title: moniker
       anchor: textDocument_moniker
   - title: Change Log
diff --git a/_implementors/sdks.md b/_implementors/sdks.md
index 620f7a19b..ee6337255 100644
--- a/_implementors/sdks.md
+++ b/_implementors/sdks.md
@@ -10,22 +10,24 @@ index: 3
 
 | Language | Maintainer | Repository |
 |------|--------|----------|
-| node.js | MS | [vscode-languageserver-node](https://github.com/Microsoft/vscode-languageserver-node)  |
+| C# | [Inomata Kentaro](https://github.com/matarillo/) | [LanguageServerProtocol](https://github.com/matarillo/LanguageServerProtocol)|
+| C# | [OmniSharp](http://www.omnisharp.net/) | [C#-LSP](https://github.com/OmniSharp/csharp-language-server-protocol)|
 | C# | MS | work in progress by [David Wilson](https://github.com/daviwil)  |
-| Java | Eclipse, TypeFox |  [Eclipse LSP4J](https://github.com/eclipse/lsp4j) |
+| C# | [Ken Domino](https://github.com/kaby76) | [LspTypes for C#](https://github.com/kaby76/lsp-types) |
+| C++ | [Kuafu](https://github.com/kuafuwang) | [LspCpp](https://github.com/kuafuwang/LspCpp)|
+| C++17 | [otreblan](https://github.com/otreblan) | [libclsp](https://github.com/otreblan/libclsp) (WIP)|
+| Go | [disposedtrolley](https://github.com/disposedtrolley) | [golsp-sdk](https://github.com/goodgophers/golsp-sdk) (WIP)|
+| Haskell | [Alan Zimmerman](https://github.com/alanz) | [Haskell-LSP](https://github.com/alanz/haskell-lsp)|
+| Haskell | [Luke Lau](https://github.com/Bubba) | [lsp-test](https://github.com/Bubba/lsp-test)|
 | Haxe | @nadako | [language-server-protocol-haxe](https://github.com/vshaxe/language-server-protocol-haxe)|
+| Java | Eclipse, TypeFox |  [Eclipse LSP4J](https://github.com/eclipse/lsp4j) |
+| node.js | MS | [vscode-languageserver-node](https://github.com/Microsoft/vscode-languageserver-node)  |
+| Objective-C | [Christopher Atlan](https://twitter.com/catlan) | [LSPKit](https://github.com/catlan/LSPKit)|
 | PHP | [Felix Becker](https://github.com/felixfbecker) | [php-language-server](https://github.com/felixfbecker/php-language-server)|
 | Python | [Open Law Library](http://www.openlawlib.org/) | [pygls](https://github.com/openlawlibrary/pygls)|
 | Python | [Yeger](https://github.com/yeger00) | [pylspclient](https://github.com/yeger00/pylspclient)|
 | Rust | [Bruno Medeiros](https://github.com/bruno-medeiros) | [RustLSP](https://github.com/RustDT/RustLSP)|
 | Rust | Bruno Medeiros and Markus Westerlind | [lsp-types](https://github.com/gluon-lang/lsp-types)
-| Haskell | [Alan Zimmerman](https://github.com/alanz) | [Haskell-LSP](https://github.com/alanz/haskell-lsp)|
-| Haskell | [Luke Lau](https://github.com/Bubba) | [lsp-test](https://github.com/Bubba/lsp-test)|
-| C# | [OmniSharp](http://www.omnisharp.net/) | [C#-LSP](https://github.com/OmniSharp/csharp-language-server-protocol)|
-| C# | [Inomata Kentaro](https://github.com/matarillo/) | [LanguageServerProtocol](https://github.com/matarillo/LanguageServerProtocol)|
-| Objective-C | [Christopher Atlan](https://twitter.com/catlan) | [LSPKit](https://github.com/catlan/LSPKit)|
+| Rust | [Eyal Kalderon](https://github.com/ebkalderon) | [tower-lsp](https://github.com/ebkalderon/tower-lsp)
 | Swift | [Chime](https://twitter.com/chimehq) | [SwiftLSPClient](https://github.com/chimehq/SwiftLSPClient)|
-| C++ | [Kuafu](https://github.com/kuafuwang) | [LspCpp](https://github.com/kuafuwang/LspCpp)|
-| Go | [disposedtrolley](https://github.com/disposedtrolley) | [golsp-sdk](https://github.com/goodgophers/golsp-sdk) (WIP)|
-| C++17 | [otreblan](https://github.com/otreblan) | [libclsp](https://github.com/otreblan/libclsp) (WIP)|
 {: .table .table-bordered .table-responsive}
diff --git a/_implementors/servers.md b/_implementors/servers.md
index 413c88448..facbcb708 100644
--- a/_implementors/servers.md
+++ b/_implementors/servers.md
@@ -63,7 +63,7 @@ index: 1
 | [Groovy](http://groovy-lang.org/) | [Prominic.NET](https://moonshine-ide.com/) | [Groovy Language Server](https://github.com/prominic/groovy-language-server) | Java |
 | [Groovy](http://groovy-lang.org/) | [VsCode Groovy Lint](https://marketplace.visualstudio.com/items?itemName=NicolasVuillamy.vscode-groovy-lint) | [VsCode Groovy Lint Language Server](https://github.com/nvuillam/vscode-groovy-lint/tree/master/server) | TypeScript |
 | HTML | MS | [vscode-html-languageserver](https://github.com/Microsoft/vscode/tree/master/extensions/html-language-features/server) | TypeScript |
-| Haskell| [Alan Zimmerman](https://github.com/alanz) | [haskell-ide-engine](https://github.com/haskell/haskell-ide-engine) | Haskell |
+| Haskell| [Alan Zimmerman](https://github.com/alanz) | [Haskell Language Server (HLS)](https://github.com/haskell/haskell-language-server) | Haskell |
 | [Haxe](https://haxe.org/) | [Haxe Foundation](https://github.com/HaxeFoundation/) | [Haxe Language Server](https://github.com/vshaxe/haxe-language-server) | Haxe |
 | [Isabelle](https://www.cl.cam.ac.uk/research/hvg/Isabelle/) | [Makarius Wenzel](https://github.com/makarius) | [sources](https://isabelle.in.tum.de/repos/isabelle/file/tip/src/Tools/VSCode) | Scala |
 | JSON | MS | [vscode-json-languageserver](https://www.npmjs.com/package/vscode-json-languageserver) | TypeScript |
@@ -118,11 +118,13 @@ index: 1
 | Scala | [Iulian Dragos](https://github.com/dragos) | [dragos-vscode-scala](https://github.com/dragos/dragos-vscode-scala) | Scala |
 | Scala | [Scalameta](https://github.com/scalameta) | [Metals](https://github.com/scalameta/metals) | Scala |
 | SPARQL | [Stardog Union](https://github.com/stardog-union) | [SPARQL Language Server](https://github.com/stardog-union/stardog-language-servers/tree/master/packages/sparql-language-server) | TypeScript |
+| Stylable | [Wix.com](https://www.wix.com) | [stylable/language-service](https://github.com/wix/stylable/tree/master/packages/language-service) | TypeScript |
 | Svelte | [UnwrittenFun](https://github.com/UnwrittenFun) | [svelte-language-server](https://github.com/UnwrittenFun/svelte-language-server) | TypeScript |
 | Swift | [Apple](https://github.com/apple) | [SourceKit-LSP](https://github.com/apple/sourcekit-lsp) | Swift |
 | Sysl | [ANZ Bank](https://github.com/anz-bank) | [Sysl LSP](https://github.com/anz-bank/sysl) | Go |
 | SystemVerilog | [dalance](https://github.com/dalance) | [svls](https://github.com/dalance/svls) | Rust |
-| [Terraform](https://terraform.io) | [Julio Tain Sueiras](https://github.com/juliosueiras) | [terraform-lsp](https://github.com/juliosueiras/terraform-lsp) | Go |
+| [Terraform](https://www.terraform.io/) | [Julio Tain Sueiras](https://github.com/juliosueiras) | [terraform-lsp](https://github.com/juliosueiras/terraform-lsp) | Go |
+| [Terraform](https://www.terraform.io/) | [HashiCorp](https://github.com/hashicorp) | [terraform-ls](https://github.com/hashicorp/terraform-ls) | Go |
 | Turtle | [Stardog Union](https://github.com/stardog-union) | [Turtle Language Server](https://github.com/stardog-union/stardog-language-servers/tree/master/packages/turtle-language-server) | TypeScript |
 | TypeCobol| [TypeCobol](https://github.com/TypeCobolTeam) | [TypeCobol language server](https://github.com/TypeCobolTeam/TypeCobol/tree/master/TypeCobol.LanguageServer) | C# |
 | TypeScript|[TypeFox](http://typefox.io/)| [typescript-language-server](https://github.com/theia-ide/typescript-language-server) | TypeScript |
@@ -137,7 +139,7 @@ index: 1
 | WXML| [Qiming Zhao](https://github.com/chemzqm)| [wxml-languageserver](https://github.com/chemzqm/wxml-languageserver) | TypeScript |
 | XML | IBM | [XML Language Server](https://github.com/microclimate-devops/xml-language-server) | Java |
 | XML | [Red Hat Developers](https://github.com/redhat-developer) and [Angelo ZERR](https://github.com/angelozerr/) | [XML Language Server (LemMinX)](https://github.com/eclipse/lemminx) | Java |
-| [Xtext language framework](https://www.eclipse.org/Xtext/) | Eclipse | [Eclipse Xtext](https://github.com/eclipse/xtext-core/blob/master/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend)| Java |
+| [Xtext language framework](https://www.eclipse.org/Xtext/) | Eclipse | [Eclipse Xtext](https://github.com/eclipse/xtext-core/blob/master/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.java)| Java |
 | YAML (with JSON schemas)| [Adam Voss](https://github.com/adamvoss) | [vscode-yaml-languageservice](https://github.com/adamvoss/vscode-yaml-languageservice) | TypeScript |
 | YAML| [Red Hat Developers](https://github.com/redhat-developer) | [yaml-language-server](https://github.com/redhat-developer/yaml-language-server) | TypeScript |
 | [YANG](https://tools.ietf.org/html/rfc7950)| [Yang tools](https://github.com/yang-tools) | [yang-lsp](https://github.com/yang-tools/yang-lsp) |  XTend |
diff --git a/_implementors/tools.md b/_implementors/tools.md
index 5e31d9f61..c041b52aa 100644
--- a/_implementors/tools.md
+++ b/_implementors/tools.md
@@ -43,4 +43,5 @@ index: 2
 | [Kate](https://kate-editor.org) | [Kate Team](https://kate-editor.org) | [kate](https://invent.kde.org/kde/kate) |
 | [JCIDE](https://www.javacardos.com/tools) | [Javacardos](https://www.javacardos.com) | [JCIDE](https://www.javacardos.com/javacardforum/viewtopic.php?f=5&t=2108&p=6175#p6175) |
 | [RAD Studio](https://www.embarcadero.com/products/rad-studio) ([Delphi](https://www.embarcadero.com/products/delphi) and [C++Builder](https://www.embarcadero.com/products/cbuilder)) | [Embarcadero](https://www.embarcadero.com/) | Proprietary |
+| [Nova](https://nova.app) | [Panic Inc](http://panic.com) | Proprietary |
 {: .table .table-bordered .table-responsive}
diff --git a/_includes/cookie_notice.html b/_includes/cookie_notice.html
index e95244158..aaa2f586a 100644
--- a/_includes/cookie_notice.html
+++ b/_includes/cookie_notice.html
@@ -1,16 +1 @@
-<div id='mscc-cookie-container'>
-  <div id='msccBanner' dir='ltr' data-site-name='uhf-code.visualstudio.com' data-mscc-version='0.4.0' data-nver='aspnet-2.0.7'
-    data-sver='0.1.2' class='cc-banner' role='alert'>
-    <div class='cc-container'>
-      <svg class='cc-icon cc-v-center' x='0px' y='0px' viewBox='0 0 44 44' height='30px' fill='none' stroke='currentColor'>
-        <circle cx='22' cy='22' r='20' stroke-width='2'></circle>
-        <line x1='22' x2='22' y1='18' y2='33' stroke-width='3'></line>
-        <line x1='22' x2='22' y1='12' y2='15' stroke-width='3'></line>
-      </svg>
-      <span class='cc-v-center cc-text'>This site uses cookies for analytics, personalized content and ads. By continuing to browse this site, you agree to
-        this use.</span>
-      <a href='https://go.microsoft.com/fwlink/?linkid=845480' aria-label='Learn more about Microsoft&#39;s Cookie Policy'
-        id='msccLearnMore' class='cc-link cc-v-center cc-float-right' data-mscc-ic='false'>Learn more</a>
-    </div>
-  </div>
-</div>
\ No newline at end of file
+<div id='cookie-banner'></div>
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index 415f594bc..9f9da3f7b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,4 +1,12 @@
 <footer class="footer">
+    <script>
+        function manageConsent() {
+            if (WcpConsent.siteConsent.isConsentRequired) {
+                WcpConsent.siteConsent.manageConsent();
+            }
+        }
+    </script>
+
     <div class="container">
         <div class="row">
             <div class="col-sm-7">
@@ -15,11 +23,19 @@
                 </ul>
             </div>
             <div class="col-sm-5">
-                <div class="copyright">
-                    <a id="footer-microsoft-link" class="logo" href="https://www.microsoft.com">
-                        <img src="{{site.baseurl}}/img/microsoft.svg" alt="Microsoft">
-                    </a>
-                </div>
+                <ul class="links">
+                    <li style="display: none;" >
+                        <a id="footer-cookie-link" style="cursor: pointer; padding-right:20px" onclick="manageConsent()"
+                            aria-label="Manage cookies">Manage cookies</a>
+                    </li>
+                    <li>
+                        <div class="copyright">
+                            <a id="footer-microsoft-link" class="logo" href="https://www.microsoft.com">
+                                <img src="{{site.baseurl}}/img/microsoft.svg" alt="Microsoft">
+                            </a>
+                        </div>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
diff --git a/_includes/head.html b/_includes/head.html
index 84f2d9466..a46b3b60b 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,7 +6,6 @@
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
     <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-    <link rel="stylesheet" href="//uhf.microsoft.com/mscc/statics/mscc-0.4.0.min.css">
 
     <!-- link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" crossorigin="anonymous" -->
     <link rel="stylesheet" href="{{ "/css/bootswatch/cosmo/bootstrap.min.css" | prepend: site.baseurl }}">
diff --git a/_includes/js_files.html b/_includes/js_files.html
index 3134ed6da..2c1bce4c1 100644
--- a/_includes/js_files.html
+++ b/_includes/js_files.html
@@ -4,8 +4,8 @@
 
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
 
-<!-- MicroSoft cookie library -->
-<script src="https://uhf.microsoft.com/mscc/statics/mscc-0.4.0.min.js"></script>
+<!-- Microsoft EU cookie compliance library -->
+<script src="https://wcpstatic.microsoft.com/mscc/lib/v2/wcp-consent.js"></script>
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-62780441-30"></script>
 
diff --git a/_specifications/lsif/0.5.0/specification.md b/_specifications/lsif/0.5.0/specification.md
index 03376eecc..85cf97fd7 100644
--- a/_specifications/lsif/0.5.0/specification.md
+++ b/_specifications/lsif/0.5.0/specification.md
@@ -67,8 +67,15 @@ where method is the JSON-RPC request method.
 Concrete examples are
 
 ```typescript
-request('file:///Users/dirkb/sample/test.ts', 'textDocument/foldingRange') -> FoldingRange[];
-request('file:///Users/dirkb/sample/test.ts', { line: 10, character: 17 }, 'textDocument/hover') -> Hover;
+request(
+  'file:///Users/dirkb/sample/test.ts',
+  'textDocument/foldingRange'
+) -> FoldingRange[];
+request(
+  'file:///Users/dirkb/sample/test.ts',
+  { line: 10, character: 17 },
+  'textDocument/hover'
+) -> Hover;
 ```
 
 The input tuple to a request is either `[uri, method]` or `[uri, position, method]` and the output is some form of result. For the same `uri` and `[uri, position]` tuple, there are many different requests to execute.
@@ -87,8 +94,12 @@ We came to the conclusion that the most flexible way to emit this is a graph, wh
 Assume there is a file `/Users/dirkb/sample.ts` and we want to store the folding range information with it then the indexer emits two vertices: one representing the document with its URI `file:///Users/dirkb/sample.ts`, the other representing the folding result. In addition, an edge would be emitted representing the `textDocument/foldingRange` request.
 
 ```typescript
-{ id: 1, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
-{ id: 2, type: "vertex", label: "foldingRangeResult", result: [ { ... }, { ... }, ... ] }
+{ id: 1, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
+{ id: 2, type: "vertex", label: "foldingRangeResult",
+  result: [ { ... }, { ... }, ... ]
+}
 { id: 3, type: "edge", label: "textDocument/foldingRange", outV: 1, inV: 2 }
 ```
 
@@ -108,7 +119,9 @@ function bar() {
 A hover request for a position denoting the `b` in `bar` will return the same result as a position denoting the `a` or `r`. To make the dump more compact, it will use ranges to capture this instead of single positions. The following vertices will be emitted in this case. Note that line, character are zero based as in the LSP:
 
 ```typescript
-{ id: 4, type: "vertex", label: "range", start: { line: 0, character: 9}, end: { line: 0, character: 12 } }
+{ id: 4, type: "vertex", label: "range",
+  start: { line: 0, character: 9}, end: { line: 0, character: 12 }
+}
 ```
 
 To bind the range to a document, we use a special edge labeled `contains` which points from a document to a set of ranges.
@@ -166,12 +179,22 @@ export interface ResultSet {
 The corresponding output of the above example with a hover using a result set looks like this:
 
 ```typescript
-{ id: 1, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 1, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 { id: 2, type: "vertex", label: "resultSet" }
-{ id: 3, type: "vertex", label: "range", start: { line: 0, character: 9}, end: { line: 0, character: 12 } }
+{ id: 3, type: "vertex", label: "range",
+  start: { line: 0, character: 9}, end: { line: 0, character: 12 }
+}
 { id: 4, type: "edge", label: "contains", outV: 1, inVs: [3] }
 { id: 5, type: "edge", label: "next", outV: 3, inV: 2 }
-{ id: 6, type: "vertex", label: "hoverResult", result: {"contents":[{"language":"typescript","value":"function bar(): void"},""] }
+{ id: 6, type: "vertex", label: "hoverResult",
+  result: {
+    "contents":[ {
+      language: "typescript", value:"function bar(): void"
+    }]
+  }
+}
 { id: 7, type: "edge", label: "textDocument/hover", outV: 2, inV: 6 }
 ```
 
@@ -211,16 +234,22 @@ This will emit the following vertices and edges to model the `textDocument/defin
 
 ```typescript
 // The document
-{ id: 4, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 4, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 
 // The bar declaration
 { id: 6, type: "vertex", label: "resultSet" }
-{ id: 9, type: "vertex", label: "range", start: { line: 0, character: 9 }, end: { line: 0, character: 12 } }
+{ id: 9, type: "vertex", label: "range",
+  start: { line: 0, character: 9 }, end: { line: 0, character: 12 }
+}
 { id: 10, type: "edge", label: "next", outV: 9, inV: 6 }
 
 
 // The bar reference
-{ id: 20, type: "vertex", label: "range", start: { line: 4, character: 2 }, end: { line: 4, character: 5 } }
+{ id: 20, type: "vertex", label: "range",
+  start: { line: 4, character: 2 }, end: { line: 4, character: 5 }
+}
 { id: 21, type: "edge", label: "next", outV: 20, inV: 6}
 
 // The definition result linked to the bar result set
@@ -286,7 +315,12 @@ where the optional range is the name range of the word hovered over.
 This makes the hover different for every location so we can't really store it with the result set. But wait, the range is the range of one of the `bar` references we already emitted and used to start to compute the result. To make the hover still reusable, we ask the index server to fill in the starting range if no range is defined in the result. So for a hover request executed on range `{ line: 4, character: 2 }, end: { line: 4, character: 5 }` the hover result will be:
 
 ```typescript
-{ id: 6, type: "vertex", label: "hoverResult", result: { contents: [ { language: "typescript", value: "function bar(): void" } ], range: { line: 4, character: 2 }, end: { line: 4, character: 5 } } }
+{ id: 6, type: "vertex", label: "hoverResult",
+  result: {
+    contents: [ { language: "typescript", value: "function bar(): void" } ],
+    range: { line: 4, character: 2 }, end: { line: 4, character: 5 }
+  }
+}
 ```
 
 ### <a href="#references" name="references" class="anchor">Request: `textDocument/references`</a>
@@ -308,15 +342,21 @@ The relevant JSON output looks like this:
 
 ```typescript
 // The document
-{ id: 4, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 4, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 
 // The bar declaration
 { id: 6, type: "vertex", label: "resultSet" }
-{ id: 9, type: "vertex", label: "range", start: { line: 0, character: 9 }, end: { line: 0, character: 12 } }
+{ id: 9, type: "vertex", label: "range",
+  start: { line: 0, character: 9 }, end: { line: 0, character: 12 }
+}
 { id: 10, type: "edge", label: "next", outV: 9, inV: 6 }
 
 // The bar reference range
-{ id: 20, type: "vertex", label: "range", start: { line: 4, character: 2 }, end: { line: 4, character: 5 } }
+{ id: 20, type: "vertex", label: "range",
+  start: { line: 4, character: 2 }, end: { line: 4, character: 5 }
+}
 { id: 21, type: "edge", label: "next", outV: 20, inV: 6 }
 
 // The reference result
@@ -325,10 +365,14 @@ The relevant JSON output looks like this:
 { id : 26, type: "edge", label: "textDocument/references",  outV: 6, inV: 25 }
 
 // Add the bar definition as a reference to the reference result
-{ id: 27, type: "edge", label: "item", outV: 25, inVs: [9], document: 4, property : "definitions" }
+{ id: 27, type: "edge", label: "item",
+  outV: 25, inVs: [9], document: 4, property: "definitions"
+}
 
 // Add the bar reference as a reference to the reference result
-{ id: 28, type: "edge", label: "item", outV: 25, inVs: [20], document:4, property: "references" }
+{ id: 28, type: "edge", label: "item",
+  outV: 25, inVs: [20], document: 4, property: "references"
+}
 ```
 
 <img src="../img/referenceResult.png" alt="References Result"  style="max-width: 50%; max-height: 50%"/>
@@ -367,11 +411,15 @@ The output looks like this:
 
 ```typescript
 // The document
-{ id: 4, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 4, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 
 // The declaration of I#foo
 { id: 13, type: "vertex", label: "resultSet" }
-{ id: 16, type: "vertex", label: "range", start: { line: 1, character: 2 }, end: { line: 1, character: 5 } }
+{ id: 16, type: "vertex", label: "range",
+  start: { line: 1, character: 2 }, end: { line: 1, character: 5 }
+}
 { id: 17, type: "edge", label: "next", outV: 16, inV: 13 }
 // The reference result for I#foo
 { id: 30, type: "vertex", label: "referenceResult" }
@@ -379,33 +427,49 @@ The output looks like this:
 
 // The declaration of A#foo
 { id: 29, type: "vertex", label: "resultSet" }
-{ id: 34, type: "vertex", label: "range", start: { line: 5, character: 2 }, end: { line: 5, character: 5 } }
+{ id: 34, type: "vertex", label: "range",
+  start: { line: 5, character: 2 }, end: { line: 5, character: 5 }
+}
 { id: 35, type: "edge", label: "next", outV: 34, inV: 29 }
 
 // The declaration of B#foo
 { id: 47, type: "vertex", label: "resultSet" }
-{ id: 50, type: "vertex", label: "range", start: { line: 10, character: 2 }, end: { line: 10, character: 5 } }
+{ id: 50, type: "vertex", label: "range",
+  start: { line: 10, character: 2 }, end: { line: 10, character: 5 }
+}
 { id: 51, type: "edge", label: "next", outV: 50, inV: 47 }
 
 // The reference i.foo()
-{ id: 65, type: "vertex", label: "range", start: { line: 15, character: 2 }, end: { line: 15, character: 5 } }
+{ id: 65, type: "vertex", label: "range",
+  start: { line: 15, character: 2 }, end: { line: 15, character: 5 }
+}
 
 // The reference b.foo()
-{ id: 78, type: "vertex", label: "range", start: { line: 18, character: 2 }, end: { line: 18, character: 5 } }
+{ id: 78, type: "vertex", label: "range",
+  start: { line: 18, character: 2 }, end: { line: 18, character: 5 }
+}
 
 // The insertion of the ranges into the shared reference result
-{ id: 90, type: "edge", label: "item", outV: 30, inVs: [16,34,50], document: 4, property: definitions }
-{ id: 91, type: "edge", label: "item", outV: 30, inVs: [65,78], document: 4, property: references }
+{ id: 90, type: "edge", label: "item",
+  outV: 30, inVs: [16,34,50], document: 4, property: "definitions"
+}
+{ id: 91, type: "edge", label: "item",
+  outV: 30, inVs: [65,78], document: 4, property: "references"
+}
 
 // Linking A#foo to I#foo
 { id: 101, type: "vertex", label: "referenceResult" }
 { id: 102, type: "edge", label: "textDocument/references", outV: 29, inV: 101 }
-{ id: 103, type: "edge", label: "item", outV: 101, inVs: [30], document: 4, property: referenceResults }
+{ id: 103, type: "edge", label: "item",
+  outV: 101, inVs: [30], document: 4, property: "referenceResults"
+}
 
 // Linking B#foo to I#foo
 { id: 114, type: "vertex", label: "referenceResult" }
 { id: 115, type: "edge", label: "textDocument/references", outV: 47, inV: 114 }
-{ id: 116, type: "edge", label: "item", outV: 114, inVs: [30], document: 4, property: referenceResults }
+{ id: 116, type: "edge", label: "item",
+  outV: 114, inVs: [30], document: 4, property: "referenceResults"
+}
 ```
 
 One goal of the language server index format is that the information can be emitted as soon as possible without caching too much information in memory. With languages that support overriding methods defined in more than one interface, this can be more complicated since the whole inheritance tree might only be known after parsing all documents.
@@ -439,21 +503,29 @@ In the above example, there will be three reference results
 
 ```typescript
 // The document
-{ id: 4, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 4, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 
 // Declaration of I#foo
 { id: 13, type: "vertex", label: "resultSet" }
-{ id: 16, type: "vertex", label: "range", start: { line: 1, character: 2 }, end: { line: 1, character: 5 } }
+{ id: 16, type: "vertex", label: "range",
+  start: { line: 1, character: 2 }, end: { line: 1, character: 5 }
+}
 { id: 17, type: "edge", label: "next", outV: 16, inV: 13 }
 
 // Declaration of II#foo
 { id: 27, type: "vertex", label: "resultSet" }
-{ id: 30, type: "vertex", label: "range", start: { line: 5, character: 2 }, end: { line: 5, character: 5 } }
+{ id: 30, type: "vertex", label: "range",
+  start: { line: 5, character: 2 }, end: { line: 5, character: 5 }
+}
 { id: 31, type: "edge", label: "next", outV: 30, inV: 27 }
 
 // Declaration of B#foo
 { id: 45, type: "vertex", label: "resultSet" }
-{ id: 52, type: "vertex", label: "range", start: { line: 9, character: 2 }, end: { line: 9, character: 5 } }
+{ id: 52, type: "vertex", label: "range",
+  start: { line: 9, character: 2 }, end: { line: 9, character: 5 }
+}
 { id: 53, type: "edge", label: "next", outV: 52, inV: 45 }
 
 // Reference result for I#foo
@@ -469,7 +541,9 @@ In the above example, there will be three reference results
 { id: 117 "typ" :"edge", label: "textDocument/references", outV: 45, inV: 116 }
 
 // Link B#foo reference result to I#foo and II#foo
-{ id: 118 "typ" :"edge", label: "item", outV: 116, inVs: [46,48], document: 4, property: "referenceResults" }
+{ id: 118 "typ" :"edge", label: "item",
+  outV: 116, inVs: [46,48], document: 4, property: "referenceResults"
+}
 ```
 
 For Typescript, method references are recorded at their most abstract declaration and if methods are merged (`B#foo`), they are combined using a reference result pointing to other results.
@@ -514,11 +588,15 @@ The relevant emitted vertices and edges looks like this:
 
 ```typescript
 // The document
-{ id: 4, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 4, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 
 // The declaration of I
 { id: 6, type: "vertex", label: "resultSet" }
-{ id: 9, type: "vertex", label: "range", start: { line: 0, character: 10 }, end: { line: 0, character: 11 } }
+{ id: 9, type: "vertex", label: "range",
+  start: { line: 0, character: 10 }, end: { line: 0, character: 11 }
+}
 { id: 10, type: "edge", label: "next", outV: 9, inV: 6 }
 
 // The declaration of i
@@ -557,7 +635,9 @@ hello();space();world();
 ```
 
 ```typescript
-{ id: 2, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 2, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 { id: 112, type: "vertex", label: "foldingRangeResult", result:[
   { startLine: 0, startCharacter: 16, endLine: 2, endCharacter: 1 },
   { startLine: 4, startCharacter: 16, endLine: 6, endCharacter: 1 },
@@ -616,8 +696,9 @@ export interface DeclarationTag {
   kind: lsp.SymbolKind;
 
   /**
-   * The full range of the declaration not including leading/trailing whitespace but everything else, e.g comments and code.
-   * The range must be included in fullRange.
+   * The full range of the declaration not including leading/trailing whitespace
+   * but everything else, e.g comments and code. The range must be included in
+   * fullRange.
    */
   fullRange: lsp.Range;
 
@@ -647,8 +728,9 @@ export interface DefinitionTag {
   kind: lsp.SymbolKind;
 
   /**
-   * The full range of the definition not including leading/trailing whitespace but everything else, e.g comments and code.
-   * The range must be included in fullRange.
+   * The full range of the definition not including leading/trailing whitespace
+   * but everything else, e.g comments and code. The range must be included in
+   * fullRange.
    */
   fullRange: lsp.Range;
 
@@ -703,11 +785,18 @@ hello();
 Will look like this:
 
 ```typescript
-{ id: 2, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 2, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 { id: 4, type: "vertex", label: "resultSet" }
 { id: 7, type: "vertex", label: "range",
   start: { line: 0, character: 9 }, end: { line: 0, character: 14 },
-  tag: { type: "definition", text: "hello", kind: 12, fullRange: { start: { line: 0, character: 0 }, end: { line: 1, character: 1 }}}
+  tag: {
+    type: "definition", text: "hello", kind: 12,
+    fullRange: {
+      start: { line: 0, character: 0 }, end: { line: 1, character: 1 }
+    }
+  }
 }
 ```
 
@@ -745,16 +834,46 @@ Produces the following output:
 
 ```typescript
 // The document
-{ id: 2 , type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 2 , type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 // The declaration of Main
-{ id: 7 , type: "vertex", label: "range", start: { line: 0, character: 10 }, end: { line: 0, character: 14 }, tag: { type: "definition", text: "Main", kind: 7, fullRange: { start: { line: 0, character: 0 }, end: { line: 5, character: 1 } } } }
+{ id: 7 , type: "vertex", label: "range",
+  start: { line: 0, character: 10 }, end: { line: 0, character: 14 },
+  tag: {
+    type: "definition", text: "Main", kind: 7,
+    fullRange: {
+      start: { line: 0, character: 0 }, end: { line: 5, character: 1 }
+    }
+  }
+}
 // The declaration of hello
-{ id: 18 , type: "vertex", label: "range", start: { line: 1, character: 11 }, end: { line: 1, character: 16 }, tag: { type: "definition", text: "hello", kind: 12, fullRange: { start: { line: 1, character: 2 }, end: { line: 2, character: 3 } } } }
+{ id: 18 , type: "vertex", label: "range",
+  start: { line: 1, character: 11 }, end: { line: 1, character: 16 },
+  tag: {
+    type: "definition", text: "hello", kind: 12,
+    fullRange: {
+      start: { line: 1, character: 2 }, end: { line: 2, character: 3 }
+    }
+  }
+}
 // The declaration of world
-{ id: 29 , type: "vertex", label: "range", start: { line: 3, character: 11 }, end: { line: 3, character: 16 }, tag: { type: "definition", text: "world", kind: 12, fullRange: { start: { line: 3, character: 2 }, end: { line: 4, character: 3 } } } }
+{ id: 29 , type: "vertex", label: "range",
+  start: { line: 3, character: 11 }, end: { line: 3, character: 16 },
+  tag: {
+    type: "definition", text: "world", kind: 12,
+    fullRange: {
+      start: { line: 3, character: 2 }, end: { line: 4, character: 3 }
+    }
+  }
+}
 // The document symbol
-{ id: 39 , type: "vertex", label: "documentSymbolResult", result: [ { id: 7 , children: [ { id: 18 }, { id: 29 } ] } ] }
-{ id: 40 , type: "edge", label: "textDocument/documentSymbol", outV: 2, inV: 39 }
+{ id: 39 , type: "vertex", label: "documentSymbolResult",
+  result: [ { id: 7 , children: [ { id: 18 }, { id: 29 } ] } ]
+}
+{ id: 40 , type: "edge", label: "textDocument/documentSymbol",
+  outV: 2, inV: 39
+}
 ```
 
 ### <a href="#diagnostic" name="diagnostic" class="anchor">Request: `textDocument/diagnostic`</a>
@@ -788,8 +907,20 @@ function foo() {
 Produces the following output:
 
 ```typescript
-{ id: 2, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
-{ id: 18, type: "vertex", label: "diagnosticResult", result: [{ severity: 1, code: 2322, message: "Type '10' is not assignable to type 'string'.", range: { start : { line: 1, character: 5 }, end: { line: 1, character: 6 } } } ] }
+{ id: 2, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
+{ id: 18, type: "vertex", label: "diagnosticResult",
+  result: [
+    {
+      severity: 1, code: 2322,
+      message: "Type '10' is not assignable to type 'string'.",
+      range: {
+        start : { line: 1, character: 5 }, end: { line: 1, character: 6 }
+      }
+    }
+  ]
+}
 { id: 19, type: "edge", label: "textDocument/diagnostic", outV: 2, inV: 18 }
 ```
 
@@ -800,8 +931,12 @@ Since diagnostics are not very common in dumps, no effort has been made to reuse
 Usually language servers operate in some sort of project context. In TypeScript, a project is defined using a `tsconfig.json` file. C# and C++ have their own means. The project file usually contains information about compile options and other parameters. Having these in the dump can be valuable. The LSIF therefore defines a project vertex. In addition, all documents that belong to that project are connected to the project using a `contains` edge. If there was a `tsconfig.json` in the previous examples, the first emitted edges and vertices would look like this:
 
 ```typescript
-{ id: 1, type: "vertex", label: "project", resource: "file:///Users/dirkb/tsconfig.json", kind: "typescript"}
-{ id: 2, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript" }
+{ id: 1, type: "vertex", label: "project",
+  resource: "file:///Users/dirkb/tsconfig.json", kind: "typescript"
+}
+{ id: 2, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript"
+}
 { id: 3, type: "edge", label: "contains", outV: 1, inVs: [2] }
 ```
 
@@ -817,7 +952,8 @@ export interface Project extends V {
 
 	/**
 	 * The project kind like 'typescript' or 'csharp'. See also the language ids
-	 * in the [specification](https://microsoft.github.io/language-server-protocol/specification)
+	 * in the specification.
+   * See https://microsoft.github.io/language-server-protocol/specification
 	 */
 	kind: string;
 
@@ -845,11 +981,18 @@ To ease the processing of an LSIF dump to for example import it into a database
 
 ```ts
 // The actual document
-{ id: 4, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript", contents: "..." }
+{ id: 4, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript",
+  contents: "..."
+}
 // The begin event
-{ id: 5, type: "vertex", label: "$event", kind: "begin", scope: "document" , data: 4 }
+{ id: 5, type: "vertex", label: "$event",
+  kind: "begin", scope: "document" , data: 4
+}
 // The end event
-{ id: 53, type: "vertex", label: "$event", kind: "end", scope: "document" , data: 4 }
+{ id: 53, type: "vertex", label: "$event",
+  kind: "end", scope: "document" , data: 4
+}
 ```
 
 Between the document vertex `4` and the document begin event `5` no information specific to document `4` can be emitted. Please note that more than one document can be open at a given point in time meaning that there have been n different document begin events without corresponding document end events.
@@ -858,12 +1001,23 @@ The events for projects looks similar:
 
 ```ts
 { id: 2, type: "vertex", label: "project", kind: "typescript" }
-{ id: 4, type: "vertex", label: "document", uri: "file:///Users/dirkb/sample.ts", languageId: "typescript", contents: "..." }
-{ id: 5, type: "vertex", label: "$event", kind: "begin", scope: "document" , data: 4 }
-{ id: 3, type: "vertex", label: "$event", kind: "begin", scope: "project", data: 2 }
-{ id: 53, type: "vertex", label: "$event", kind: "end", scope: "document", data: 4 }
+{ id: 4, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/sample.ts", languageId: "typescript",
+  contents: "..."
+}
+{ id: 5, type: "vertex", label: "$event",
+  kind: "begin", scope: "document" , data: 4
+}
+{ id: 3, type: "vertex", label: "$event",
+  kind: "begin", scope: "project", data: 2
+}
+{ id: 53, type: "vertex", label: "$event",
+  kind: "end", scope: "document", data: 4
+}
 { id: 54, type: "edge", label: "contains", outV: 2, inVs: [4] }
-{ id: 55, type: "vertex", label: "$event", kind: "end", scope: "project", data: 2 }
+{ id: 55, type: "vertex", label: "$event",
+  kind: "end", scope: "project", data: 2
+}
 ```
 
 ### <a href="#exportsImports" name="exportsImports" class="anchor">Project exports and external imports (Monikers)</a>
@@ -889,29 +1043,51 @@ export class Emitter {
 ```
 
 ```typescript
-{ id: 4, type: "vertex", label: "document", uri: "file:///Users/dirkb/index.ts", languageId: "typescript", contents: "..." }
+{ id: 4, type: "vertex", label: "document",
+  uri: "file:///Users/dirkb/index.ts", languageId: "typescript",
+  contents: "..."
+}
 { id: 11, type: "vertex", label: "resultSet" }
-{ id: 12, type: "vertex", label: "moniker", kind: "export", scheme: "tsc", identifier: "lib/index:func", unique: "group" }
+{ id: 12, type: "vertex", label: "moniker",
+  kind: "export", scheme: "tsc", identifier: "lib/index:func", unique: "group"
+}
 { id: 13, type: "edge", label: "moniker", outV: 11, inV: 12 }
-{ id: 14, type: "vertex", label: "range", start: { line: 0, character: 16 }, end: { line: 0, character: 20 } }
+{ id: 14, type: "vertex", label: "range",
+  start: { line: 0, character: 16 }, end: { line: 0, character: 20 }
+}
 { id: 15, type: "edge", label: "next", outV: 14, inV: 11 }
 
 { id: 18, type: "vertex", label: "resultSet" }
-{ id: 19, type: "vertex", label: "moniker", kind: "export", scheme: "tsc", identifier: "lib/index:Emitter", unique: "group" }
+{ id: 19, type: "vertex", label: "moniker",
+  kind: "export", scheme: "tsc", identifier: "lib/index:Emitter",
+  unique: "group"
+}
 { id: 20, type: "edge", label: "moniker", outV: 18, inV: 19 }
-{ id: 21, type: "vertex", label: "range", start: { line: 3, character: 13 }, end: { line: 3, character: 20 } }
+{ id: 21, type: "vertex", label: "range",
+  start: { line: 3, character: 13 }, end: { line: 3, character: 20 }
+}
 { id: 22, type: "edge", label: "next", outV: 21, inV: 18 }
 
 { id: 25, type: "vertex", label: "resultSet" }
-{ id: 26, type: "vertex", label: "moniker", kind: "export", scheme: "tsc", identifier: "lib/index:Emitter.doEmit", unique: "group" }
+{ id: 26, type: "vertex", label: "moniker",
+  kind: "export", scheme: "tsc", identifier: "lib/index:Emitter.doEmit",
+  unique: "group"
+}
 { id: 27, type: "edge", label: "moniker", outV: 25, inV: 26 }
-{ id: 28, type: "vertex", label: "range", start: { line: 4, character: 10 }, end: { line: 4, character: 16 } }
+{ id: 28, type: "vertex", label: "range",
+  start: { line: 4, character: 10 }, end: { line: 4, character: 16 }
+}
 { id: 29, type: "edge", label: "next", outV: 28, inV: 25 }
 
 { id: 32, type: "vertex", label: "resultSet" }
-{ id: 33, type: "vertex", label: "moniker", kind: "export", scheme: "tsc", identifier: "lib/index:Emitter.emit", unique: "group" }
+{ id: 33, type: "vertex", label: "moniker",
+  kind: "export", scheme: "tsc", identifier: "lib/index:Emitter.emit",
+  unique: "group"
+}
 { id: 34, type: "edge", label: "moniker", outV: 32, inV: 33 }
-{ id: 35, type: "vertex", label: "range", start: { line: 7, character: 9 }, end: { line: 7, character: 13 } }
+{ id: 35, type: "vertex", label: "range",
+  start: { line: 7, character: 9 }, end: { line: 7, character: 13 }
+}
 { id: 36, type: "edge", label: "next", outV: 35, inV: 32 }
 ```
 
@@ -964,7 +1140,11 @@ Now if a user search for reference to `Widget#dispose` it is expected that the r
 To make this work we first need to group projects into larger units so that we know in which projects `d.dispose` is actually a match. Assume there is a totally unrelated project PX which also uses `Disposable` from P1 but P2 is never linked into one system with PX. So a object of type `Wdiget` can never flow to code in PX hence reference in PX should not be listed. We therefore introduce the notation of a group to logically group projects into larger systems. Projects belong to a group and groups are identified using a URI. Lets look at the concrete dumps for P1 and P2:
 
 ```typescript
-{id: 2, type: "vertex", label: "group", uri: "https://github.com/microsoft/lsif-node.git/samples/ts-cascade", conflictResolution: "takeDB", name: "ts-cascade", rootUri: "file:///Users/dirkb/samples/ts-cascade" }
+{id: 2, type: "vertex", label: "group",
+  uri: "https://github.com/microsoft/lsif-node.git/samples/ts-cascade",
+  conflictResolution: "takeDB", name: "ts-cascade",
+  rootUri: "file:///Users/dirkb/samples/ts-cascade"
+}
 {id: 4, type: "vertex", label: "project", kind: "typescript", name: "p1" }
 {id: 5, type: "edge", label: "belongsTo", outV: 4, inV:2 }
 ```
@@ -974,7 +1154,11 @@ As a group URI the path in a GitHub repository is used. However the URI could al
 The dump for project P2 looks like this:
 
 ```typescript
-{id: 2, type: "vertex", label: "group", uri: "https://github.com/Microsoft/lsif-node.git/samples/ts-cascade", conflictResolution: "takeDB", name: "ts-cascade", rootUri: "file:///Users/dirkb/samples/ts-cascade" }
+{id: 2, type: "vertex", label: "group",
+  uri: "https://github.com/Microsoft/lsif-node.git/samples/ts-cascade",
+  conflictResolution: "takeDB", name: "ts-cascade",
+  rootUri: "file:///Users/dirkb/samples/ts-cascade"
+}
 {id: 4, type: "vertex", label: "project", kind: "typescript", name: "p2" }
 {id: 5, type: "edge", label: "belongsTo", outV: 4, inV: 2 }
 ```
@@ -990,10 +1174,21 @@ Now lets look how we ensure that searching for references for `Widget#dispose` f
 // The result set for the Disposable#dispose symbol
 { id: 21, type: "vertex", label: "resultSet" }
 // The export moniker of Disposable#dispose in P1 (note kind export).
-{ id: 22, type: "vertex", label: "moniker", scheme: "tsc", identifier: "p1/lib/p1Main:Disposable.dispose", unique: "group", kind:"export" }
+{ id: 22, type: "vertex", label: "moniker",
+  scheme: "tsc", identifier: "p1/lib/p1Main:Disposable.dispose",
+  unique: "group", kind:"export"
+}
 { id: 23, type: "edge", label: "moniker", outV: 21, inV: 22 }
 // The actual definition of the symbol
-{ id: 24, type: "vertex", label: "range", start: { line: 1, character: 1 }, end: { line: 1, character: 8 }, tag: { type: definition, text: "dispose", kind: 7, fullRange: { start : { line: 1, character:1 }, end: { line: 1, character: 17 } } } }
+{ id: 24, type: "vertex", label: "range",
+  start: { line: 1, character: 1 }, end: { line: 1, character: 8 },
+  tag: {
+    type: definition, text: "dispose", kind: 7,
+    fullRange: {
+      start : { line: 1, character:1 }, end: { line: 1, character: 17 }
+    }
+  }
+}
 // Bind the reference result to the result set
 { id: 57, type: "vertex", label: "referenceResult" }
 { id: 58, type: "edge", label: "textDocument/references", outV: 21, inV: 57 }
@@ -1011,23 +1206,47 @@ When generating the dump for P2 the information for `Widget#dispose` will look l
 
 ```typescript
 // The import moniker for importing Disposable#dispose into P2
-{ id: 22, type: "vertex", label: "moniker", scheme: "tsc", identifier: "p1/lib/p1Main:Disposable.dispose", unique: "group", kind: "import" }
+{ id: 22, type: "vertex", label: "moniker",
+  scheme: "tsc", identifier: "p1/lib/p1Main:Disposable.dispose",
+  unique: "group", kind: "import"
+}
 
 // The result set for Widget#dispose
 { id: 78, type: "vertex", label: "resultSet" }
-// The moniker for Widget#dispose. Note that the moniker is local since the Widget class is not exported
-{ id: 79, type: "vertex", label: "moniker", scheme: "tsc", identifier: "2Q46RTVRZTuVW1ajf68/Vw==", unique: "document", kind: "local" }
+// The moniker for Widget#dispose. Note that the moniker is local since the
+// Widget class is not exported
+{ id: 79, type: "vertex", label: "moniker",
+  scheme: "tsc", identifier: "2Q46RTVRZTuVW1ajf68/Vw==",
+  unique: "document", kind: "local"
+}
 { id: 80, type: "edge", label: "moniker", outV: 78, inV: 79 }
 // The actual definition of the symbol
-{ id: 81, type: "vertex", label: "range", start: { line: 3, character: 8 }, end: { line: 3, character: 15 }, tag: { type: "definition", text: "dispose", kind: 6, fullRange: { start: { line: 3, character: 1 }, end: { line: 4, character: 2 } } } }
+{ id: 81, type: "vertex", label: "range",
+  start: { line: 3, character: 8 }, end: { line: 3, character: 15 },
+  tag: {
+    type: "definition", text: "dispose", kind: 6,
+    fullRange: {
+      start: { line: 3, character: 1 }, end: { line: 4, character: 2 }
+    }
+  }
+}
 // Bind the reference result to Widget#dispose
 { id: 116, type: "vertex", label: "referenceResult" }
 { id: 117, type: "edge", label: "textDocument/references", outV: 78, inV: 116}
-{ id: 118, type: "edge", label: "item", outV: 116, inVs: [43], document: 52, property: "referenceResults" }
-// Link the reference result set of Disposable#dispose to this result set using a moniker
-{ id: 119, type: "edge", label: "item", outV: 116, inVs: [22], document: 52, property: "referenceLinks" }
-{ id: 120, type: "edge", label: "item", outV: 43, inVs: [81], document: 52, property: "definitions" }
-{ id: 121, type: "edge", label: "item", outV: 43, inVs: [96], document: 52, property: "references" }
+{ id: 118, type: "edge", label: "item",
+  outV: 116, inVs: [43], document: 52, property: "referenceResults"
+}
+// Link the reference result set of Disposable#dispose to this result set
+// using a moniker
+{ id: 119, type: "edge", label: "item",
+  outV: 116, inVs: [22], document: 52, property: "referenceLinks"
+}
+{ id: 120, type: "edge", label: "item",
+  outV: 43, inVs: [81], document: 52, property: "definitions"
+}
+{ id: 121, type: "edge", label: "item",
+  outV: 43, inVs: [96], document: 52, property: "references"
+}
 ```
 
 The noteworthy parts are:
@@ -1073,23 +1292,37 @@ export class Emitter {
 then these monikers can be translated into monikers that are `npm` dependent. Instead of replacing the monikers we emit a second set of monikers and link the `tsc` monikers to corresponding `npm` monikers using an `attach`edge:
 
 ```typescript
-{ id: 991, type: "vertex", label: "packageInformation", name: "lsif-ts-sample", manager: "npm", version: "1.0.0" }
+{ id: 991, type: "vertex", label: "packageInformation",
+  name: "lsif-ts-sample", manager: "npm", version: "1.0.0"
+}
 
-{ id: 987, type: "vertex", label: "moniker", kind: "export", scheme: "npm", identifier: "lsif-ts-sample::func", unique: "scheme" }
+{ id: 987, type: "vertex", label: "moniker",
+  kind: "export", scheme: "npm", identifier: "lsif-ts-sample::func",
+  unique: "scheme"
+}
 { id: 986, type: "edge", label: "packageInformation", outV: 987, inV: 991 }
 { id: 985, type: "edge", label: "attach", outV: 987, inV: 12 }
 
-{ id: 984, type: "vertex", label: "moniker", kind: "export", scheme: "npm", identifier: "lsif-ts-sample::Emitter", unique: "scheme" }
+{ id: 984, type: "vertex", label: "moniker",
+  kind: "export", scheme: "npm", identifier: "lsif-ts-sample::Emitter",
+  unique: "scheme"
+}
 { id: 983, type: "edge", label: "packageInformation", outV: 984, inV: 991 }
 { id: 982, type: "edge", label: "attach", outV: 984, inV: 19 }
 
-{ id: 981, type: "vertex", label: "moniker", kind: "export", scheme: "npm", identifier: "lsif-ts-sample::Emitter.doEmit", unique: "scheme" }
+{ id: 981, type: "vertex", label: "moniker",
+  kind: "export", scheme: "npm",
+  identifier: "lsif-ts-sample::Emitter.doEmit", unique: "scheme"
+}
 { id: 980, type: "edge", label: "packageInformation", outV: 981, inV: 991 }
 { id: 979, type: "edge", label: "attach", outV: 981, inV: 26 }
 
-{id: 978, type: "vertex", label: "moniker", kind: "export", scheme: "npm", identifier: "lsif-ts-sample::Emitter.emit", unique: "scheme" }
-{id: 977, type: "edge", label: "packageInformation", outV: 978, inV: 991 }
-{id: 976, type: "edge", label: "attach", outV: 978, inV: 33 }
+{ id: 978, type: "vertex", label: "moniker",
+  kind: "export", scheme: "npm",
+  identifier: "lsif-ts-sample::Emitter.emit", unique: "scheme"
+}
+{ id: 977, type: "edge", label: "packageInformation", outV: 978, inV: 991 }
+{ id: 976, type: "edge", label: "attach", outV: 978, inV: 33 }
 ```
 Things to observe:
 
@@ -1112,11 +1345,19 @@ let map: mobx.ObservableMap = new mobx.ObservableMap();
 where `mobx` is the [npm mobx package](https://www.npmjs.com/package/mobx). Running the tsc index tools produces:
 
 ```typescript
-{ id: 41, type: "vertex", label: "document", uri: "file:///Users/dirkb/samples/node_modules/mobx/lib/types/observablemap.d.ts", languageId: "typescript", contents: "..." }
+{ id: 41, type: "vertex", label: "document",
+  uri: "file:///samples/node_modules/mobx/lib/types/observablemap.d.ts",
+  languageId: "typescript", contents: "..."
+}
 { id: 55, type: "vertex", label: "resultSet" }
-{ id: 57, type: "vertex", label: "moniker",  kind: "import", scheme: "tsc", identifier: "node_modules/mobx/lib/mobx:ObservableMap", unique: 'group' }
+{ id: 57, type: "vertex", label: "moniker",
+  kind: "import", scheme: "tsc",
+  identifier: "node_modules/mobx/lib/mobx:ObservableMap", unique: 'group'
+}
 { id: 58, type: "edge", label: "moniker", outV: 55, inV: 57 }
-{ id: 59, type: "vertex", label: "range", start: { line: 17, character: 538 }, end: { line: 17, character: 551 } }
+{ id: 59, type: "vertex", label: "range",
+  start: { line: 17, character: 538 }, end: { line: 17, character: 551 }
+}
 { id: 60, type: "edge", label: "next", outV: 59, inV: 55 }
 ```
 
@@ -1125,8 +1366,14 @@ Three things to note here: First, TypeScript uses declarations files for externa
 However piping this information through the npm tool will generate the following information:
 
 ```typescript
-{id: 991, type: "vertex", label: "packageInformation", name: "mobx", manager: "npm", version: "5.6.0", repository: { type: "git", url: "git+https://github.com/mobxjs/mobx.git" } }
-{ id: 978, type: "vertex", label: "moniker", kind: "import", scheme: "npm", identifier: "mobx::ObservableMap", unique: 'scheme' }
+{ id: 991, type: "vertex", label: "packageInformation",
+  name: "mobx", manager: "npm", version: "5.6.0",
+  repository: { type: "git", url: "git+https://github.com/mobxjs/mobx.git" }
+}
+{ id: 978, type: "vertex", label: "moniker",
+  kind: "import", scheme: "npm", identifier: "mobx::ObservableMap",
+  unique: 'scheme'
+}
 { id: 977, type: "edge", label: "packageInformation", outV: 978, inV: 991 }
 { id: 976, type: "edge", label: "attach", outV: 978, inV: 57 }
 ```
@@ -1148,9 +1395,20 @@ The moniker for `x` looks like this:
 
 ```ts
 { id: 13, type: "vertex", label: "resultSet" }
-{ id: 14, type: "vertex", label: "moniker", kind: "local", scheme: "tsc", identifier: "SfeOP6s53Y2HAkcViolxYA==", unique: 'document' }
+{ id: 14, type: "vertex", label: "moniker",
+  kind: "local", scheme: "tsc", identifier: "SfeOP6s53Y2HAkcViolxYA==",
+  unique: 'document'
+}
 { id: 15, type: "edge", label: "moniker", outV: 13, inV: 14 }
-{ id: 16, type: "vertex", label: "range", start: { line: 0, character: 13 }, end: { line: 0, character: 14 }, tag: { type: "definition", text: "x", kind: 7, fullRange: { start: { line: 0, character: 13 }, end: { line: 0, character: 22 } } } }
+{ id: 16, type: "vertex", label: "range",
+  start: { line: 0, character: 13 }, end: { line: 0, character: 14 },
+  tag: {
+    type: "definition", text: "x", kind: 7,
+    fullRange: {
+      start: { line: 0, character: 13 }, end: { line: 0, character: 22 }
+    }
+  }
+}
 { id: 17, type: "edge", label: "next", outV: 16, inV: 13 }
 ```
 
@@ -1180,9 +1438,10 @@ export interface MetaData {
   label: 'metaData';
 
   /**
-   * The version of the LSIF format using semver notation. See https://semver.org/. Please note
-   * the version numbers starting with 0 don't adhere to semver and adopters have to assume
-   * the each new version is breaking.
+   * The version of the LSIF format using semver notation. See
+   * https://semver.org/. Please note the version numbers starting with 0
+   * don't adhere to semver and adopters have to assume the each new version
+   * is breaking.
    */
   version: string;
 
diff --git a/_specifications/specification-3-15.md b/_specifications/specification-3-15.md
index 82d744c56..d86529d34 100644
--- a/_specifications/specification-3-15.md
+++ b/_specifications/specification-3-15.md
@@ -10,7 +10,7 @@ index: 2
 
 This document describes the 3.15.x version of the language server protocol. An implementation for node of the 3.15.x version of the protocol can be found [here](https://github.com/Microsoft/vscode-languageserver-node).
 
-**Note:** edits to this specification can be made via a pull request against this markdown [document](https://github.com/Microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-15.md).
+**Note:** edits to this specification can be made via a pull request against this Markdown [document](https://github.com/Microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-15.md).
 
 ## <a href="#whatIsNew" name="whatIsNew" class="anchor"> What's new in 3.15 </a>
 
@@ -277,12 +277,12 @@ interface Position {
 	line: number;
 
 	/**
-	 * Character offset on a line in a document (zero-based). Assuming that the line is
-	 * represented as a string, the `character` value represents the gap between the
-	 * `character` and `character + 1`.
+	 * Character offset on a line in a document (zero-based). Assuming that the
+	 * line is represented as a string, the `character` value represents the gap
+	 * between the `character` and `character + 1`.
 	 *
-	 * If the character value is greater than the line length it defaults back to the
-	 * line length.
+	 * If the character value is greater than the line length it defaults back
+	 * to the line length.
 	 */
 	character: number;
 }
@@ -331,8 +331,8 @@ interface LocationLink {
 	/**
 	 * Span of the origin of this link.
 	 *
-	 * Used as the underlined span for mouse interaction. Defaults to the word range at
-	 * the mouse position.
+	 * Used as the underlined span for mouse interaction.
+	 * Defaults to the word range at the mouse position.
 	 */
 	originSelectionRange?: Range;
 
@@ -342,15 +342,19 @@ interface LocationLink {
 	targetUri: DocumentUri;
 
 	/**
-	 * The full target range of this link. If the target for example is a symbol then target range is the
-	 * range enclosing this symbol not including leading/trailing whitespace but everything else
-	 * like comments. This information is typically used to highlight the range in the editor.
+	 * The full target range of this link.
+	 * For example, if the target is a symbol, then target range is the range
+	 * enclosing this symbol not including leading/trailing whitespace but
+	 * everything else like comments.
+	 * This information is typically used to highlight the range in the editor.
 	 */
 	targetRange: Range;
 
 	/**
-	 * The range that should be selected and revealed when this link is being followed, e.g the name of a function.
-	 * Must be contained by the the `targetRange`. See also `DocumentSymbol#range`
+	 * The range that should be selected and revealed when this link is being
+	 * followed, for example, the name of a function.
+	 * Must be contained by the the `targetRange`.
+	 * See also `DocumentSymbol#range`
 	 */
 	targetSelectionRange: Range;
 }
@@ -437,8 +441,8 @@ export namespace DiagnosticTag {
     /**
      * Unused or unnecessary code.
      *
-     * Clients are allowed to render diagnostics with this tag faded out instead of having
-     * an error squiggle.
+     * Clients are allowed to render diagnostics with this tag faded out
+	 * instead of having an error squiggle.
      */
     export const Unnecessary: 1 = 1;
     /**
@@ -456,9 +460,9 @@ export type DiagnosticTag = 1 | 2;
 
 ```typescript
 /**
- * Represents a related message and source code location for a diagnostic. This should be
- * used to point to code locations that cause or are related to a diagnostics, e.g when duplicating
- * a symbol in a scope.
+ * Represents a related message and source code location for a diagnostic.
+ * This should be used to point to code locations that cause or are related
+ * to a diagnostics, for example, when duplicating a symbol in a scope.
  */
 export interface DiagnosticRelatedInformation {
 	/**
@@ -659,18 +663,24 @@ export interface WorkspaceEdit {
 	changes?: { [uri: DocumentUri]: TextEdit[]; };
 
 	/**
-	 * Depending on the client capability `workspace.workspaceEdit.resourceOperations` document changes
-	 * are either an array of `TextDocumentEdit`s to express changes to n different text documents
-	 * where each text document edit addresses a specific version of a text document. Or it can contain
-	 * above `TextDocumentEdit`s mixed with create, rename and delete file / folder operations.
+	 * The client capability `workspace.workspaceEdit.resourceOperations`
+	 * determines whether document changes are either an array of
+	 * `TextDocumentEdit`s to express changes to different text documents,
+	 * where each text document edit addresses a specific version
+	 * of a text document, or it can contains the above `TextDocumentEdit`s
+	 * mixed with create, rename, and delete file / folder operations.
 	 *
 	 * Whether a client supports versioned document edits is expressed via
 	 * `workspace.workspaceEdit.documentChanges` client capability.
 	 *
-	 * If a client neither supports `documentChanges` nor `workspace.workspaceEdit.resourceOperations` then
-	 * only plain `TextEdit`s using the `changes` property are supported.
+	 * If a client doesn't support `documentChanges` or
+	 * `workspace.workspaceEdit.resourceOperations`, then only plain
+	 * `TextEdit`s using the `changes` property are supported.
 	 */
-	documentChanges?: (TextDocumentEdit[] | (TextDocumentEdit | CreateFile | RenameFile | DeleteFile)[]);
+	documentChanges?: (
+		TextDocumentEdit[] |
+		(TextDocumentEdit | CreateFile | RenameFile | DeleteFile)[]
+	);
 }
 ```
 
@@ -731,13 +741,15 @@ export namespace ResourceOperationKind {
 	export const Delete: ResourceOperationKind = 'delete';
 }
 
-export type FailureHandlingKind = 'abort' | 'transactional' | 'undo' | 'textOnlyTransactional';
+export type FailureHandlingKind = 'abort' | 'transactional' | 'undo'
+	| 'textOnlyTransactional';
 
 export namespace FailureHandlingKind {
 
 	/**
-	 * Applying the workspace change is simply aborted if one of the changes provided
-	 * fails. All operations executed before the failing operation stay executed.
+	 * Applying the workspace change is simply aborted if one of the changes
+	 * provided fails.
+	 * All operations executed before the failing operation stay executed.
 	 */
 	export const Abort: FailureHandlingKind = 'abort';
 
@@ -749,11 +761,13 @@ export namespace FailureHandlingKind {
 
 
 	/**
-	 * If the workspace edit contains only textual file changes they are executed transactional.
-	 * If resource changes (create, rename or delete file) are part of the change the failure
-	 * handling strategy is abort.
+	 * If the workspace edit contains only textual file changes, they are
+	 * executed transactionally.
+	 * If resource changes (create, rename or delete file) are part of the
+	 * change, the failure handling strategy is abort.
 	 */
-	export const TextOnlyTransactional: FailureHandlingKind = 'textOnlyTransactional';
+	export const TextOnlyTransactional: FailureHandlingKind
+		= 'textOnlyTransactional';
 
 	/**
 	 * The client tries to undo the operations already executed. But there is no
@@ -872,14 +886,15 @@ An identifier to denote a specific version of a text document.
 ```typescript
 interface VersionedTextDocumentIdentifier extends TextDocumentIdentifier {
 	/**
-	 * The version number of this document. If a versioned text document identifier
-	 * is sent from the server to the client and the file is not open in the editor
-	 * (the server has not received an open notification before) the server can send
-	 * `null` to indicate that the version is known and the content on disk is the
-	 * master (as speced with document content ownership).
+	 * The version number of this document.
+	 * If a versioned text document identifier is sent from the server to the
+	 * client and the file is not open in the editor (the server has not
+	 * received an open notification before), the server can send `null` to
+	 * indicate that the version is known and the content on disk is the
+	 * master (as specified with document content ownership).
 	 *
-	 * The version number of a document will increase after each change, including
-	 * undo/redo. The number doesn't need to be consecutive.
+	 * The version number of a document will increase after each change,
+	 * including undo/redo. The number doesn't need to be consecutive.
 	 */
 	version: number | null;
 }
@@ -932,9 +947,13 @@ export interface DocumentFilter {
 	 * - `*` to match one or more characters in a path segment
 	 * - `?` to match on one character in a path segment
 	 * - `**` to match any number of path segments, including none
-	 * - `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
-	 * - `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
-	 * - `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+	 * - `{}` to group conditions
+	 *   (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+	 * - `[]` to declare a range of characters to match in a path segment
+	 *   (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+	 * - `[!...]` to negate a range of characters to match in a path segment
+	 *   (e.g., `example.[!0-9]` to match on `example.a`, `example.b`,
+	 *    but not `example.0`)
 	 */
 	pattern?: string;
 }
@@ -973,8 +992,9 @@ Options to dynamically register for requests for a set of text documents.
  */
 export interface TextDocumentRegistrationOptions {
 	/**
-	 * A document selector to identify the scope of the registration. If set to null
-	 * the document selector provided on the client side will be used.
+	 * A document selector to identify the scope of the registration.
+	 * If set to null, the document selector provided on the client side
+	 * will be used.
 	 */
 	documentSelector: DocumentSelector | null;
 }
@@ -982,7 +1002,7 @@ export interface TextDocumentRegistrationOptions {
 
 #### <a href="#markupContent" name="markupContent" class="anchor"> MarkupContent </a>
 
- A `MarkupContent` literal represents a string value which content can be represented in different formats. Currently `plaintext` and `markdown` are supported formats. A `MarkupContent` is usually used in documentation properties of result literals like `CompletionItem` or `SignatureInformation`.
+ A `MarkupContent` literal represents a string value which content can be represented in different formats. Currently `plaintext` and `markdown` are supported formats. A `MarkupContent` is usually used in documentation properties of result literals like `CompletionItem` or `SignatureInformation`. If the format is `markdown` the content can contain fenced code blocks like in [GitHub issues](https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting)
 
 ```typescript
 /**
@@ -1006,13 +1026,14 @@ export namespace MarkupKind {
 export type MarkupKind = 'plaintext' | 'markdown';
 
 /**
- * A `MarkupContent` literal represents a string value which content is interpreted base on its
- * kind flag. Currently the protocol supports `plaintext` and `markdown` as markup kinds.
+ * A `MarkupContent` literal represents a string value, which content is
+ * interpreted base on its kind flag.
+ * Currently the protocol supports `plaintext` and `markdown` as markup kinds.
  *
- * If the kind is `markdown` then the value can contain fenced code blocks like in GitHub issues.
- * See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+ * If the kind is `markdown`, then the value can contain fenced code blocks
+ * like in GitHub issues.
  *
- * Here is an example how such a string can be constructed using JavaScript / TypeScript:
+ * An example how such a string is constructed using JavaScript / TypeScript:
  * ```typescript
  * let markdown: MarkdownContent = {
  *  kind: MarkupKind.Markdown,
@@ -1026,8 +1047,9 @@ export type MarkupKind = 'plaintext' | 'markdown';
  * };
  * ```
  *
- * *Please Note* that clients might sanitize the return markdown. A client could decide to
- * remove HTML from the markdown to avoid script execution.
+ * *Please Note* that clients might sanitize the returned Markdown.
+ * A client could decide to remove HTML from the Markdown to avoid
+ * script execution.
  */
 export interface MarkupContent {
 	/**
@@ -1067,8 +1089,8 @@ export interface WorkDoneProgressBegin {
 
 	/**
 	 * Controls if a cancel button should show to allow the user to cancel the
-	 * long running operation. Clients that don't support cancellation are allowed
-	 * to ignore the setting.
+	 * long running operation.
+	 * Clients that don't support cancellation can ignore the setting.
 	 */
 	cancellable?: boolean;
 
@@ -1103,11 +1125,12 @@ export interface WorkDoneProgressReport {
 	kind: 'report';
 
 	/**
-	 * Controls enablement state of a cancel button. This property is only valid if a cancel
-	 * button got requested in the `WorkDoneProgressStart` payload.
+	 * Controls enablement state of a cancel button. T
+	 * This property is only valid if a cancel button is requested in
+	 * the `WorkDoneProgressStart` payload.
 	 *
-	 * Clients that don't support cancellation or don't support control the button's
-	 * enablement state are allowed to ignore the setting.
+	 * Clients that don't support cancellation or don't support controlling
+	 * the button's enablement state are allowed to ignore the setting.
 	 */
 	cancellable?: boolean;
 
@@ -1153,8 +1176,10 @@ export interface WorkDoneProgressEnd {
 
 Work Done progress can be initiated in two different ways:
 
-1. by the sender of a request (mostly clients) using the predefined `workDoneToken` property in the requests parameter literal.
-1. by a server using the request `window/workDoneProgress/create`.
+1. by the sender of a request (mostly clients) using the predefined `workDoneToken` property in the requests parameter literal. The document will refer to this kind of progress as client initiated progress.
+1. by a server using the request `window/workDoneProgress/create`. The document will refer to this kind of progress as server initiated progress.
+
+###### <a href="#clientInitiatedProgress" name="clientInitiatedProgress" class="anchor">Client Initiated Progress </a>
 
 Consider a client sending a `textDocument/reference` request to a server and the client accepts work done progress reporting on that request. To signal this to the server the client would add a `workDoneToken` property to the reference request parameters. Something like this:
 
@@ -1175,6 +1200,17 @@ Consider a client sending a `textDocument/reference` request to a server and the
 }
 ```
 
+The corresponding type definition for the parameter property looks like this:
+
+```typescript
+export interface WorkDoneProgressParams {
+	/**
+	 * An optional token that a server can use to report work done progress.
+	 */
+	workDoneToken?: ProgressToken;
+}
+```
+
 A server uses the `workDoneToken` to report progress for the specific `textDocument/reference`. For the above request the `$/progress` notification params look like this:
 
 ```json
@@ -1190,25 +1226,9 @@ A server uses the `workDoneToken` to report progress for the specific `textDocum
 }
 ```
 
-Server initiated work done progress works the same. The only difference is that the server requests a progress user interface using the `window/workDoneProgress/create` request providing a token that is afterwards used to report progress.
-
-##### <a href="#signalingWorkDoneProgressReporting" name="signalingWorkDoneProgressReporting" class="anchor"> Signaling Work Done Progress Reporting </a>
-
-To keep the protocol backwards compatible servers are only allowed to use work done progress reporting if the client signals corresponding support using the client capability `window.workDoneProgress` which is defined as follows:
-
-```typescript
-	/**
-	 * Window specific client capabilities.
-	 */
-	window?: {
-		/**
-		 * Whether client supports handling progress notifications.
-		 */
-		workDoneProgress?: boolean;
-	}
-```
+There is no specific client capability signaling whether a client will send a progress token per request. The reason for this is that this is in many clients not a static aspect and might even change for every request instance for the same request type. So the capability is signal on every request instance by the presence of a `workDoneToken` property.
 
-To avoid that clients set up a progress monitor user interface before sending a request but the server doesn't actually report any progress a server needs to signal work done progress reporting in the corresponding server capability. For the above find references example a server would signal such a support by setting the `referencesProvider` property in the server capabilities as follows:
+To avoid that clients set up a progress monitor user interface before sending a request but the server doesn't actually report any progress a server needs to signal general work done progress reporting support in the corresponding server capability. For the above find references example a server would signal such a support by setting the `referencesProvider` property in the server capabilities as follows:
 
 ```json
 {
@@ -1218,27 +1238,30 @@ To avoid that clients set up a progress monitor user interface before sending a
 }
 ```
 
-#### <a href="#workDoneProgressParams" name="workDoneProgressParams" class="anchor"> WorkDoneProgressParams </a>
-
-A parameter literal used to pass a work done progress token.
+The corresponding type definition for the server capability looks like this:
 
 ```typescript
-export interface WorkDoneProgressParams {
-	/**
-	 * An optional token that a server can use to report work done progress.
-	 */
-	workDoneToken?: ProgressToken;
+export interface WorkDoneProgressOptions {
+	workDoneProgress?: boolean;
 }
 ```
+###### <a href="#serverInitiatedProgress" name="serverInitiatedProgress" class="anchor">Server Initiated Progress </a>
 
-#### <a href="#workDoneProgressOptions" name="workDoneProgressOptions" class="anchor"> WorkDoneProgressOptions </a>
+Servers can also initiate progress reporting using the `window/workDoneProgress/create` request. This is useful if the server needs to report progress outside of a request (for example the server needs to re-index a database). The returned token can then be used to report progress using the same notifications used as for client initiated progress.
 
-Options to signal work done progress support in server capabilities.
+To keep the protocol backwards compatible servers are only allowed to use `window/workDoneProgress/create` request if the client signals corresponding support using the client capability `window.workDoneProgress` which is defined as follows:
 
 ```typescript
-export interface WorkDoneProgressOptions {
-	workDoneProgress?: boolean;
-}
+	/**
+	 * Window specific client capabilities.
+	 */
+	window?: {
+		/**
+		 * Whether client supports server initiated progress using the
+		 * `window/workDoneProgress/create` request.
+		 */
+		workDoneProgress?: boolean;
+	}
 ```
 
 #### <a href="#partialResults" name="partialResults" class="anchor"> Partial Result Progress </a>
@@ -1282,8 +1305,8 @@ A parameter literal used to pass a partial result token.
 ```typescript
 export interface PartialResultParams {
 	/**
-	 * An optional token that a server can use to report partial results (e.g. streaming) to
-	 * the client.
+	 * An optional token that a server can use to report partial results
+	 * (for example, streaming) to the client.
 	 */
 	partialResultToken?: ProgressToken;
 }
@@ -1297,7 +1320,7 @@ This section documents the actual language server protocol. It uses the followin
 * an optional _Client capability_ section describing the client capability of the request. This includes the client capabilities property path and JSON structure.
 * an optional _Server Capability_ section describing the server capability of the request. This includes the server capabilities property path and JSON structure.
 * a _Request_ section describing the format of the request sent. The method is a string identifying the request the params are documented using a TypeScript interface. It is also documented whether the request supports work done progress and partial result progress.
-* a _Response_ section describing the format of the response. The result item describes the returned data in case of a success. The optional partial result item describes the returned data of a partial result notification. The error.data describes the returned data in case of an error. Please remember that in case of a failure the response already contains an error.code and an error.message field. These fields are only spec'd if the protocol forces the use of certain error codes or messages. In cases where the server can decide on these values freely they aren't listed here.
+* a _Response_ section describing the format of the response. The result item describes the returned data in case of a success. The optional partial result item describes the returned data of a partial result notification. The error.data describes the returned data in case of an error. Please remember that in case of a failure the response already contains an error.code and an error.message field. These fields are only specified if the protocol forces the use of certain error codes or messages. In cases where the server can decide on these values freely they aren't listed here.
 * a _Registration Options_ section describing the registration option if the request or notification supports dynamic capability registration.
 
 #### Request, Notification and Response ordering
@@ -1328,9 +1351,10 @@ _Request_:
 ```typescript
 interface InitializeParams extends WorkDoneProgressParams {
 	/**
-	 * The process Id of the parent process that started
-	 * the server. Is null if the process has not been started by another process.
-	 * If the parent process is not alive then the server should exit (see exit notification) its process.
+	 * The process ID of the parent process that started the server.
+	 * Is null if the process has not been started by another process.
+	 * If the parent process is not alive, then the server should exit
+	 * (see exit notification) its process.
 	 */
 	processId: number | null;
 
@@ -1505,7 +1529,8 @@ export interface TextDocumentClientCapabilities {
 	rename?: RenameClientCapabilities;
 
 	/**
-	 * Capabilities specific to the `textDocument/publishDiagnostics` notification.
+	 * Capabilities specific to the `textDocument/publishDiagnostics`
+	 * notification.
 	 */
 	publishDiagnostics?: PublishDiagnosticsClientCapabilities;
 
@@ -1548,12 +1573,14 @@ interface ClientCapabilities {
 		workspaceEdit?: WorkspaceEditClientCapabilities;
 
 		/**
-		* Capabilities specific to the `workspace/didChangeConfiguration` notification.
+		* Capabilities specific to the `workspace/didChangeConfiguration`
+		* notification.
 		*/
 		didChangeConfiguration?: DidChangeConfigurationClientCapabilities;
 
 		/**
-		* Capabilities specific to the `workspace/didChangeWatchedFiles` notification.
+		* Capabilities specific to the `workspace/didChangeWatchedFiles`
+		* notification.
 		*/
 		didChangeWatchedFiles?: DidChangeWatchedFilesClientCapabilities;
 
@@ -1592,8 +1619,9 @@ interface ClientCapabilities {
 	 */
 	window?: {
 		/**
-		 * Whether client supports handling progress notifications. If set servers are allowed to
-		 * report in `workDoneProgress` property in the request specific server capabilities.
+		 * Whether client supports handling progress notifications.
+		 * If set, servers are allowed to report in `workDoneProgress` property
+		 * in the request specific server capabilities.
 		 *
 		 * Since 3.15.0
 		 */
@@ -1643,9 +1671,10 @@ interface InitializeResult {
  */
 export namespace InitializeError {
 	/**
-	 * If the protocol version provided by the client can't be handled by the server.
-	 * @deprecated This initialize error got replaced by client capabilities. There is
-	 * no version handshake in version 3.0x
+	 * If the protocol version provided by the client can't be handled by
+	 * the server.
+	 * @deprecated This initialize error was replaced by client capabilities.
+	 * There is no version handshake in version 3.0x
 	 */
 	export const unknownProtocolVersion: number = 1;
 }
@@ -1670,8 +1699,10 @@ The server can signal the following capabilities:
 ```typescript
 interface ServerCapabilities {
 	/**
-	 * Defines how text documents are synced. Is either a detailed structure defining each notification or
-	 * for backwards compatibility the TextDocumentSyncKind number. If omitted it defaults to `TextDocumentSyncKind.None`.
+	 * Defines how text documents are synced.
+	 * Is either a detailed structure defining each notification
+	 * or for backwards compatibility, the TextDocumentSyncKind number.
+	 * If omitted, it defaults to `TextDocumentSyncKind.None`.
 	 */
 	textDocumentSync?: TextDocumentSyncOptions | number;
 
@@ -1695,7 +1726,8 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.14.0
 	 */
-	declarationProvider?: boolean | DeclarationOptions | DeclarationRegistrationOptions;
+	declarationProvider?: boolean | DeclarationOptions
+		| DeclarationRegistrationOptions;
 
 	/**
 	 * The server provides goto definition support.
@@ -1707,14 +1739,16 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.6.0
 	 */
-	typeDefinitionProvider?: boolean | TypeDefinitionOptions | TypeDefinitionRegistrationOptions;
+	typeDefinitionProvider?: boolean | TypeDefinitionOptions
+		| TypeDefinitionRegistrationOptions;
 
 	/**
 	 * The server provides goto implementation support.
 	 *
 	 * @since 3.6.0
 	 */
-	implementationProvider?: boolean | ImplementationOptions | ImplementationRegistrationOptions;
+	implementationProvider?: boolean | ImplementationOptions
+		| ImplementationRegistrationOptions;
 
 	/**
 	 * The server provides find references support.
@@ -1732,14 +1766,15 @@ interface ServerCapabilities {
 	documentSymbolProvider?: boolean | DocumentSymbolOptions;
 
 	/**
-	 * The server provides code actions. The `CodeActionOptions` return type is only
-	 * valid if the client signals code action literal support via the property
+	 * The server provides code actions.
+	 * The `CodeActionOptions` return type is only valid if the client signals
+	 * code action literal support via the property
 	 * `textDocument.codeAction.codeActionLiteralSupport`.
 	 */
 	codeActionProvider?: boolean | CodeActionOptions;
 
 	/**
-	 * The server provides code lens.
+	 * The server provides CodeLens.
 	 */
 	codeLensProvider?: CodeLensOptions;
 
@@ -1753,7 +1788,8 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.6.0
 	 */
-	colorProvider?: boolean | DocumentColorOptions | DocumentColorRegistrationOptions;
+	colorProvider?: boolean | DocumentColorOptions
+		| DocumentColorRegistrationOptions;
 
 	/**
 	 * The server provides document formatting.
@@ -1782,7 +1818,8 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.10.0
 	 */
-	foldingRangeProvider?: boolean | FoldingRangeOptions | FoldingRangeRegistrationOptions;
+	foldingRangeProvider?: boolean | FoldingRangeOptions
+		| FoldingRangeRegistrationOptions;
 
 	/**
 	 * The server provides execute command support.
@@ -1794,12 +1831,13 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.15.0
 	 */
-	selectionRangeProvider?: boolean | SelectionRangeOptions | SelectionRangeRegistrationOptions;
+	selectionRangeProvider?: boolean | SelectionRangeOptions
+		| SelectionRangeRegistrationOptions;
 
 	/**
 	 * The server provides workspace symbol support.
 	 */
-	workspaceSymbolProvider?: boolean;
+	workspaceSymbolProvider?: boolean | WorkspaceSymbolOptions;
 
 	/**
 	 * Workspace specific server capabilities
@@ -2319,9 +2357,9 @@ _Client Capability_:
 ```typescript
 export interface DidChangeWatchedFilesClientCapabilities {
 	/**
-	 * Did change watched files notification supports dynamic registration. Please note
-	 * that the current protocol doesn't support static configuration for file changes
-	 * from the server side.
+	 * Did change watched files notification supports dynamic registration.
+	 * Please note that the current protocol doesn't support static
+	 * configuration for file changes from the server side.
 	 */
 	dynamicRegistration?: boolean;
 }
@@ -2347,9 +2385,13 @@ export interface FileSystemWatcher {
 	 * - `*` to match one or more characters in a path segment
 	 * - `?` to match on one character in a path segment
 	 * - `**` to match any number of path segments, including none
-	 * - `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
-	 * - `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
-	 * - `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+	 * - `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript
+	 *   and JavaScript files)
+	 * - `[]` to declare a range of characters to match in a path segment
+	 *   (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+	 * - `[!...]` to negate a range of characters to match in a path segment
+	 *   (e.g., `example.[!0-9]` to match on `example.a`, `example.b`,
+	 *    but not `example.0`)
 	 */
 	globPattern: string;
 
@@ -2444,7 +2486,8 @@ interface WorkspaceSymbolClientCapabilities {
 	dynamicRegistration?: boolean;
 
 	/**
-	 * Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
+	 * Specific capabilities for the `SymbolKind` in the
+	 * `workspace/symbol` request.
 	 */
 	symbolKind?: {
 		/**
@@ -2473,7 +2516,8 @@ export interface WorkspaceSymbolOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `WorkspaceSymbolRegistrationOptions` defined as follows:
 ```typescript
-export interface WorkspaceSymbolRegistrationOptions extends WorkspaceSymbolOptions {
+export interface WorkspaceSymbolRegistrationOptions
+	extends WorkspaceSymbolOptions {
 }
 ```
 
@@ -2485,7 +2529,8 @@ _Request_:
 /**
  * The parameters of a Workspace Symbol Request.
  */
-interface WorkspaceSymbolParams extends WorkDoneProgressParams, PartialResultParams {
+interface WorkspaceSymbolParams
+	extends WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * A query string to filter symbols by. Clients may send an empty
 	 * string here to request all symbols.
@@ -2536,7 +2581,8 @@ _Registration Options_: `ExecuteCommandRegistrationOptions` defined as follows:
 /**
  * Execute command registration options.
  */
-export interface ExecuteCommandRegistrationOptions extends ExecuteCommandOptions {
+export interface ExecuteCommandRegistrationOptions
+	extends ExecuteCommandOptions {
 }
 ```
 
@@ -2617,7 +2663,7 @@ export interface ApplyWorkspaceEditResponse {
 
 #### <a href="#textDocument_synchronization" name="textDocument_synchronization" class="anchor">Text Document Synchronization</a>
 
-Client support for `textDocument/didOpen`, `textDocument/didChange` and `textDocument/didClose` notifications is mandatory in the protocol and clients can not opt out supporting them. This includes both full and incremental syncronization in the `textDocument/didChange` notification. In addition a server must either implement all three of them or none. Their capabilities are therefore controlled via a combined client and server capability.
+Client support for `textDocument/didOpen`, `textDocument/didChange` and `textDocument/didClose` notifications is mandatory in the protocol and clients can not opt out supporting them. This includes both full and incremental synchronization in the `textDocument/didChange` notification. In addition a server must either implement all three of them or none. Their capabilities are therefore controlled via a combined client and server capability.
 
 <a href="#textDocument_synchronization_cc" name="textDocument_synchronization_cc" class="anchor">_Client Capability_:</a>
 * property path (optional): `textDocument.synchronization.dynamicRegistration`
@@ -2631,7 +2677,8 @@ Controls whether text document synchronization supports dynamic registration.
 
 ```typescript
 /**
- * Defines how the host (editor) should sync document changes to the language server.
+ * Defines how the host (editor) should sync document changes
+ * to the language server.
  */
 export namespace TextDocumentSyncKind {
 	/**
@@ -2655,14 +2702,16 @@ export namespace TextDocumentSyncKind {
 
 export interface TextDocumentSyncOptions {
 	/**
-	 * Open and close notifications are sent to the server. If omitted open close notification should not
-	 * be sent.
+	 * Open and close notifications are sent to the server.
+	 * If omitted open close notification should not be sent.
 	 */
 	openClose?: boolean;
 
 	/**
-	 * Change notifications are sent to the server. See TextDocumentSyncKind.None, TextDocumentSyncKind.Full
-	 * and TextDocumentSyncKind.Incremental. If omitted it defaults to TextDocumentSyncKind.None.
+	 * Change notifications are sent to the server.
+	 * See TextDocumentSyncKind.None, TextDocumentSyncKind.Full,
+	 * and TextDocumentSyncKind.Incremental.
+	 * If omitted, it defaults to TextDocumentSyncKind.None.
 	 */
 	change?: TextDocumentSyncKind;
 }
@@ -2710,7 +2759,8 @@ _Registration Options_: `TextDocumentChangeRegistrationOptions` defined as follo
 /**
  * Describe options to be used when registering for text document change events.
  */
-export interface TextDocumentChangeRegistrationOptions extends TextDocumentRegistrationOptions {
+export interface TextDocumentChangeRegistrationOptions
+	extends TextDocumentRegistrationOptions {
 	/**
 	 * How documents are synced to the server. See TextDocumentSyncKind.Full
 	 * and TextDocumentSyncKind.Incremental.
@@ -2733,24 +2783,28 @@ interface DidChangeTextDocumentParams {
 	textDocument: VersionedTextDocumentIdentifier;
 
 	/**
-	 * The actual content changes. The content changes describe single state changes
-	 * to the document. So if there are two content changes c1 (at array index 0) and
-	 * c2 (at array index 1) for a document in state S then c1 moves the document from
-	 * S to S' and c2 from S' to S''. So c1 is computed on the state S and c2 is computed
-	 * on the state S'.
+	 * The actual content changes.
+	 * The content changes describe single state changes to the document.
+	 * If there are two content changes c1 (at array index 0) and
+	 * c2 (at array index 1) for a document in state S, then c1 moves the
+	 * document from S to S' and c2 from S' to S''.
+	 * So c1 is computed on the state S and c2 is computed on the state S'.
 	 *
-	 * To mirror the content of a document using change events use the following approach:
+	 * To mirror the content of a document using change events,
+	 * use the following approach:
 	 * - start with the same initial content
-	 * - apply the 'textDocument/didChange' notifications in the order you recevie them.
-	 * - apply the `TextDocumentContentChangeEvent`s in a single notification in the order
-	 *   you receive them.
+	 * - apply the 'textDocument/didChange' notifications
+	 *     in the order you receive them.
+	 * - apply the `TextDocumentContentChangeEvent`s
+	 *     in a single notification in the order you receive them.
 	 */
 	contentChanges: TextDocumentContentChangeEvent[];
 }
 
 /**
- * An event describing a change to a text document. If range and rangeLength are omitted
- * the new text is considered to be the full content of the document.
+ * An event describing a change to a text document.
+ * If range and rangeLength are omitted, the new text is considered to be
+ * the full content of the document.
  */
 export type TextDocumentContentChangeEvent = {
 	/**
@@ -2821,8 +2875,8 @@ export interface WillSaveTextDocumentParams {
 export namespace TextDocumentSaveReason {
 
 	/**
-	 * Manually triggered, e.g. by the user pressing save, by starting debugging,
-	 * or by an API call.
+	 * Manually triggered, for example, by the user pressing save,
+	 * by starting debugging, or by an API call.
 	 */
 	export const Manual = 1;
 
@@ -2891,7 +2945,8 @@ The capability indicates that the server is interested in `textDocument/didSave`
 
 _Registration Options_: `TextDocumentSaveRegistrationOptions` defined as follows:
 ```typescript
-export interface TextDocumentSaveRegistrationOptions extends TextDocumentRegistrationOptions {
+export interface TextDocumentSaveRegistrationOptions
+	extends TextDocumentRegistrationOptions {
 	/**
 	 * The client is supposed to include the content on save.
 	 */
@@ -2971,7 +3026,8 @@ export interface TextDocumentSyncClientCapabilities {
 }
 
 /**
- * Defines how the host (editor) should sync document changes to the language server.
+ * Defines how the host (editor) should sync document changes
+ * to the language server.
  */
 export namespace TextDocumentSyncKind {
 	/**
@@ -2995,28 +3051,30 @@ export namespace TextDocumentSyncKind {
 
 export interface TextDocumentSyncOptions {
 	/**
-	 * Open and close notifications are sent to the server. If omitted open close notification should not
-	 * be sent.
+	 * Open and close notifications are sent to the server.
+	 * If omitted, open close notification should not be sent.
 	 */
 	openClose?: boolean;
 	/**
-	 * Change notifications are sent to the server. See TextDocumentSyncKind.None, TextDocumentSyncKind.Full
-	 * and TextDocumentSyncKind.Incremental. If omitted it defaults to TextDocumentSyncKind.None.
+	 * Change notifications are sent to the server.
+	 * See TextDocumentSyncKind.None, TextDocumentSyncKind.Full,
+	 * and TextDocumentSyncKind.Incremental.
+	 * If omitted, it defaults to TextDocumentSyncKind.None.
 	 */
 	change?: number;
 	/**
-	 * If present will save notifications are sent to the server. If omitted the notification should not be
-	 * sent.
+	 * If present will save notifications are sent to the server.
+	 * If omitted, the notification should not be sent.
 	 */
 	willSave?: boolean;
 	/**
-	 * If present will save wait until requests are sent to the server. If omitted the request should not be
-	 * sent.
+	 * If present will save wait until requests are sent to the server.
+	 * If omitted, the request should not be sent.
 	 */
 	willSaveWaitUntil?: boolean;
 	/**
-	 * If present save notifications are sent to the server. If omitted the notification should not be
-	 * sent.
+	 * If present save notifications are sent to the server.
+	 * If omitted, the notification should not be sent.
 	 */
 	save?: boolean | SaveOptions;
 }
@@ -3081,8 +3139,8 @@ interface PublishDiagnosticsParams {
 	uri: DocumentUri;
 
 	/**
-	 * Optional the version number of the document the diagnostics are published for.
-	 *
+	 * The version number of the document the diagnostics are published for.
+	 * Optional.
 	 * @since 3.15.0
 	 */
 	version?: number;
@@ -3119,8 +3177,9 @@ export interface CompletionClientCapabilities {
 		 *
 		 * A snippet can define tab stops and placeholders with `$1`, `$2`
 		 * and `${3:foo}`. `$0` defines the final tab stop, it defaults to
-		 * the end of the snippet. Placeholders with equal identifiers are linked,
-		 * that is typing in one will update others too.
+		 * the end of the snippet.
+		 * Placeholders with equal identifiers are linked, so that typing in
+		 * one will update others as well.
 		 */
 		snippetSupport?: boolean;
 
@@ -3146,10 +3205,10 @@ export interface CompletionClientCapabilities {
 		preselectSupport?: boolean;
 
 		/**
-		 * Client supports the tag property on a completion item. Clients supporting
-		 * tags have to handle unknown tags gracefully. Clients especially need to
-		 * preserve unknown tags when sending a completion item back to the server in
-		 * a resolve call.
+		 * Client supports the tag property on a completion item.
+		 * Clients supporting tags have to handle unknown tags gracefully.
+		 * Clients especially need to preserve unknown tags when sending
+		 * a completion item back to the server in a resolve call.
 		 *
 		 * @since 3.15.0
 		 */
@@ -3193,24 +3252,28 @@ _Server Capability_:
  */
 export interface CompletionOptions extends WorkDoneProgressOptions {
 	/**
-	 * Most tools trigger completion request automatically without explicitly requesting
-	 * it using a keyboard shortcut (e.g. Ctrl+Space). Typically they do so when the user
-	 * starts to type an identifier. For example if the user types `c` in a JavaScript file
-	 * code complete will automatically pop up present `console` besides others as a
-	 * completion item. Characters that make up identifiers don't need to be listed here.
+	 * Most tools trigger completion request automatically without explicitly
+	 * requesting it using a keyboard shortcut (for example Ctrl+Space).
+	 * Typically they do so when the user starts to type an identifier.
+	 * For example, if the user types `c` in a JavaScript file, code complete
+	 * will automatically display `console` along with others as a
+	 * completion item.
+	 * Characters that make up identifiers don't need to be listed here.
 	 *
-	 * If code complete should automatically be trigger on characters not being valid inside
-	 * an identifier (for example `.` in JavaScript) list them in `triggerCharacters`.
+	 * If code complete should automatically be triggered on characters
+	 * not being valid inside an identifier (for example `.` in JavaScript),
+	 * list them in `triggerCharacters`.
 	 */
 	triggerCharacters?: string[];
 
 	/**
-	 * The list of all possible characters that commit a completion. This field can be used
-	 * if clients don't support individual commit characters per completion item. See
-	 * `ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`.
+	 * The list of all possible characters that commit a completion.
+	 * This field can be used if clients don't support individual commit
+	 * characters per completion item. See `ClientCapabilities.`
+	 * `textDocument.completion.completionItem.commitCharactersSupport`.
 	 *
-	 * If a server provides both `allCommitCharacters` and commit characters on an individual
-	 * completion item the ones on the completion item win.
+	 * If a server provides both `allCommitCharacters` and commit characters
+	 * on an individual completion item, the ones on the completion item win.
 	 *
 	 * @since 3.2.0
 	 */
@@ -3226,7 +3289,8 @@ export interface CompletionOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `CompletionRegistrationOptions` options defined as follows:
 ```typescript
-export interface CompletionRegistrationOptions extends TextDocumentRegistrationOptions, CompletionOptions {
+export interface CompletionRegistrationOptions
+	extends TextDocumentRegistrationOptions, CompletionOptions {
 }
 ```
 
@@ -3235,10 +3299,13 @@ _Request_:
 * params: `CompletionParams` defined as follows:
 
 ```typescript
-export interface CompletionParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface CompletionParams
+	extends TextDocumentPositionParams, WorkDoneProgressParams,
+	PartialResultParams {
 	/**
-	 * The completion context. This is only available if the client specifies
-	 * to send this using `ClientCapabilities.textDocument.completion.contextSupport === true`
+	 * The completion context.
+	 * This is only available if the client specifies to send this using
+	 * `ClientCapabilities.textDocument.completion.contextSupport === true`
 	 */
 	context?: CompletionContext;
 }
@@ -3255,7 +3322,7 @@ export namespace CompletionTriggerKind {
 
 	/**
 	 * Completion was triggered by a trigger character specified by
-	 * the `triggerCharacters` properties of the `CompletionRegistrationOptions`.
+	 * the `triggerCharacters` properties of `CompletionRegistrationOptions`.
 	 */
 	export const TriggerCharacter: 2 = 2;
 
@@ -3268,7 +3335,8 @@ export type CompletionTriggerKind = 1 | 2 | 3;
 
 
 /**
- * Contains additional information about the context in which a completion request is triggered.
+ * Contains additional information about the context in which a completion
+ * request is triggered.
  */
 export interface CompletionContext {
 	/**
@@ -3277,7 +3345,7 @@ export interface CompletionContext {
 	triggerKind: CompletionTriggerKind;
 
 	/**
-	 * The trigger character (a single character) that has trigger code complete.
+	 * The trigger character (single character) that has trigger code complete.
 	 * Is undefined if `triggerKind !== CompletionTriggerKind.TriggerCharacter`
 	 */
 	triggerCharacter?: string;
@@ -3289,8 +3357,8 @@ _Response_:
 
 ```typescript
 /**
- * Represents a collection of [completion items](#CompletionItem) to be presented
- * in the editor.
+ * Represents a collection of [completion items](#CompletionItem) to be
+ * presented in the editor.
  */
 export interface CompletionList {
 	/**
@@ -3329,8 +3397,8 @@ export namespace InsertTextFormat {
 export type InsertTextFormat = 1 | 2;
 
 /**
- * Completion item tags are extra annotations that tweak the rendering of a completion
- * item.
+ * Completion item tags are extra annotations that tweak the rendering of
+ * a completion item.
  *
  * @since 3.15.0
  */
@@ -3409,52 +3477,56 @@ export interface CompletionItem {
 	 * this completion. When `falsy` the label is used.
 	 *
 	 * The `insertText` is subject to interpretation by the client side.
-	 * Some tools might not take the string literally. For example
-	 * VS Code when code complete is requested in this example `con<cursor position>`
-	 * and a completion item with an `insertText` of `console` is provided it
-	 * will only insert `sole`. Therefore it is recommended to use `textEdit` instead
-	 * since it avoids additional client side interpretation.
+	 * Some tools might not take the string literally.
+	 * For example, VS Code when code complete is requested in this example
+	 * `con<cursor position>` and a completion item with an `insertText` of
+	 * `console` is provided, it will only insert `sole`.
+	 * Therefore, it is recommended to use `textEdit` instead since it avoids
+	 * additional client side interpretation.
 	 */
 	insertText?: string;
 
 	/**
-	 * The format of the insert text. The format applies to both the `insertText` property
-	 * and the `newText` property of a provided `textEdit`. If omitted defaults to
-	 * `InsertTextFormat.PlainText`.
+	 * The format of the insert text.
+	 * The format applies to both the `insertText` property and the `newText`
+	 * property of a provided `textEdit`.
+	 * If omitted, defaults to `InsertTextFormat.PlainText`.
 	 */
 	insertTextFormat?: InsertTextFormat;
 
 	/**
-	 * An edit which is applied to a document when selecting this completion. When an edit is provided the value of
-	 * `insertText` is ignored.
+	 * An edit that is applied to a document when selecting this completion.
+	 * When an edit is provided, the value of `insertText` is ignored.
 	 *
-	 * *Note:* The range of the edit must be a single line range and it must contain the position at which completion
-	 * has been requested.
+	 * *Note:* The range of the edit must be a single line range and it must
+	 * contain the position at which completion has been requested.
 	 */
 	textEdit?: TextEdit;
 
 	/**
 	 * An optional array of additional text edits that are applied when
-	 * selecting this completion. Edits must not overlap (including the same insert position)
-	 * with the main edit nor with themselves.
+	 * selecting this completion.
+	 * Edits must not overlap (including the same insert position) with the
+	 * main edit nor with themselves.
 	 *
-	 * Additional text edits should be used to change text unrelated to the current cursor position
-	 * (for example adding an import statement at the top of the file if the completion item will
-	 * insert an unqualified type).
+	 * Additional text edits should be used to change text unrelated to the
+	 * current cursor position (for example adding an import statement at the
+	 * top of the file if the completion item will insert an unqualified type).
 	 */
 	additionalTextEdits?: TextEdit[];
 
 	/**
-	 * An optional set of characters that when pressed while this completion is active will accept it first and
-	 * then type that character. *Note* that all commit characters should have `length=1` and that superfluous
-	 * characters will be ignored.
+	 * An optional set of characters that when pressed, while this completion
+	 * is active, will accept it first and then type that character.
+	 * *Note* that all commit characters should have `length=1` and that
+	 * superfluous characters will be ignored.
 	 */
 	commitCharacters?: string[];
 
 	/**
-	 * An optional command that is executed *after* inserting this completion. *Note* that
-	 * additional modifications to the current document should be described with the
-	 * additionalTextEdits-property.
+	 * An optional command that is executed *after* inserting this completion.
+	 * *Note* that additional modifications to the current document should be
+	 * described with the additionalTextEdits-property.
 	 */
 	command?: Command;
 
@@ -3627,7 +3699,8 @@ export interface HoverOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `HoverRegistrationOptions` defined as follows:
 ```typescript
-export interface HoverRegistrationOptions extends TextDocumentRegistrationOptions, HoverOptions {
+export interface HoverRegistrationOptions
+	extends TextDocumentRegistrationOptions, HoverOptions {
 }
 ```
 
@@ -3636,7 +3709,8 @@ _Request_:
 * params: `HoverParams` defined as follows:
 
 ```typescript
-export interface HoverParams extends TextDocumentPositionParams, WorkDoneProgressParams {
+export interface HoverParams
+	extends TextDocumentPositionParams, WorkDoneProgressParams {
 }
 ```
 
@@ -3665,17 +3739,17 @@ Where `MarkedString` is defined as follows:
 
 ```typescript
 /**
- * MarkedString can be used to render human readable text. It is either a markdown string
- * or a code-block that provides a language and a code snippet. The language identifier
- * is semantically equal to the optional language identifier in fenced code blocks in GitHub
- * issues. See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+ * MarkedString can be used to render human readable text.
+ * It is either a Markdown string or a code-block that provides a language
+ * and a code snippet. The language identifier is semantically equal to the
+ * optional language identifier in fenced code blocks in GitHub issues.
  *
- * The pair of a language and a value is an equivalent to markdown:
+ * The pair of a language and a value is an equivalent to Markdown:
  * ```${language}
  * ${value}
  * ```
  *
- * Note that markdown strings will be sanitized - that means html will be escaped.
+ * Note that Markdown strings will be sanitized, meaning HTML will be escaped.
 * @deprecated use MarkupContent instead.
 */
 type MarkedString = string | { language: string; value: string };
@@ -3750,8 +3824,9 @@ export interface SignatureHelpOptions extends WorkDoneProgressOptions {
 	/**
 	 * List of characters that re-trigger signature help.
 	 *
-	 * These trigger characters are only active when signature help is already showing. All trigger characters
-	 * are also counted as re-trigger characters.
+	 * These trigger characters are only active when signature help is already
+	 * showing.
+	 * All trigger characters are also counted as re-trigger characters.
 	 *
 	 * @since 3.15.0
 	 */
@@ -3761,7 +3836,8 @@ export interface SignatureHelpOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `SignatureHelpRegistrationOptions` defined as follows:
 ```typescript
-export interface SignatureHelpRegistrationOptions extends TextDocumentRegistrationOptions, SignatureHelpOptions {
+export interface SignatureHelpRegistrationOptions
+	extends TextDocumentRegistrationOptions, SignatureHelpOptions {
 }
 ```
 
@@ -3770,10 +3846,12 @@ _Request_:
 * params: `SignatureHelpParams` defined as follows:
 
 ```typescript
-export interface SignatureHelpParams extends TextDocumentPositionParams, WorkDoneProgressParams {
+export interface SignatureHelpParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams {
 	/**
-	 * The signature help context. This is only available if the client specifies
-	 * to send this using the client capability  `textDocument.signatureHelp.contextSupport === true`
+	 * The signature help context.
+	 * This is only available if the client specifies to send this using the
+	 * client capability `textDocument.signatureHelp.contextSupport === true`.
 	 *
 	 * @since 3.15.0
 	 */
@@ -3795,14 +3873,16 @@ export namespace SignatureHelpTriggerKind {
 	 */
 	export const TriggerCharacter: 2 = 2;
 	/**
-	 * Signature help was triggered by the cursor moving or by the document content changing.
+	 * Signature help was triggered by the cursor moving or
+	 * by the document content changing.
 	 */
 	export const ContentChange: 3 = 3;
 }
 export type SignatureHelpTriggerKind = 1 | 2 | 3;
 
 /**
- * Additional information about the context in which a signature help request was triggered.
+ * Additional information about the context in which a
+ * signature help request was triggered.
  *
  * @since 3.15.0
  */
@@ -3815,23 +3895,25 @@ export interface SignatureHelpContext {
 	/**
 	 * Character that caused signature help to be triggered.
 	 *
-	 * This is undefined when `triggerKind !== SignatureHelpTriggerKind.TriggerCharacter`
+	 * This is undefined when
+	 * `triggerKind !== SignatureHelpTriggerKind.TriggerCharacter`.
 	 */
 	triggerCharacter?: string;
 
 	/**
 	 * `true` if signature help was already showing when it was triggered.
 	 *
-	 * Retriggers occur when the signature help is already active and can be caused by actions such as
-	 * typing a trigger character, a cursor move, or document content changes.
+	 * Retriggers occur when the signature help is already active and can be
+	 * caused by actions such as typing a trigger character, a cursor move,
+	 * or document content changes.
 	 */
 	isRetrigger: boolean;
 
 	/**
 	 * The currently active `SignatureHelp`.
 	 *
-	 * The `activeSignatureHelp` has its `SignatureHelp.activeSignature` field updated based on
-	 * the user navigating through available signatures.
+	 * The `activeSignatureHelp` has its `SignatureHelp.activeSignature` field
+	 * updated based on the user navigating through available signatures.
 	 */
 	activeSignatureHelp?: SignatureHelp;
 }
@@ -3848,7 +3930,7 @@ _Response_:
  */
 export interface SignatureHelp {
 	/**
-	 * One or more signatures. If no signaures are availabe the signature help
+	 * One or more signatures. If no signatures are available the signature help
 	 * request should return `null`.
 	 */
 	signatures: SignatureInformation[];
@@ -3911,12 +3993,14 @@ export interface ParameterInformation {
 	/**
 	 * The label of this parameter information.
 	 *
-	 * Either a string or an inclusive start and exclusive end offsets within its containing
-	 * signature label. (see SignatureInformation.label). The offsets are based on a UTF-16
-	 * string representation as `Position` and `Range` does.
+	 * Either a string or an inclusive start and exclusive end offsets within
+	 * its containing signature label. (see SignatureInformation.label).
+	 * The offsets are based on a UTF-16 string representation
+	 * as `Position` and `Range` does.
 	 *
-	 * *Note*: a label of type string should be a substring of its containing signature label.
-	 * Its intended use case is to highlight the parameter label part in the `SignatureInformation.label`.
+	 * *Note*: a label of type string should be a substring of its containing
+	 * signature label. Its intended use case is to highlight the
+	 * parameter label part in the `SignatureInformation.label`.
 	 */
 	label: string | [number, number];
 
@@ -3945,9 +4029,10 @@ _Client Capability_:
 ```typescript
 export interface DeclarationClientCapabilities {
 	/**
-	 * Whether declaration supports dynamic registration. If this is set to `true`
-	 * the client supports the new `DeclarationRegistrationOptions` return value
-	 * for the corresponding server capability as well.
+	 * Whether declaration supports dynamic registration.
+	 * If this is set to `true`, the client supports the new
+	 * `DeclarationRegistrationOptions` return value for the
+	 * corresponding server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 
@@ -3969,7 +4054,8 @@ export interface DeclarationOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DeclarationRegistrationOptions` defined as follows:
 ```typescript
-export interface DeclarationRegistrationOptions extends DeclarationOptions, TextDocumentRegistrationOptions, StaticRegistrationOptions  {
+export interface DeclarationRegistrationOptions extends DeclarationOptions,
+	TextDocumentRegistrationOptions, StaticRegistrationOptions  {
 }
 ```
 
@@ -3978,7 +4064,8 @@ _Request_:
 * params: `DeclarationParams` defined as follows:
 
 ```typescript
-export interface DeclarationParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface DeclarationParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -4024,7 +4111,8 @@ export interface DefinitionOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DefinitionRegistrationOptions` defined as follows:
 ```typescript
-export interface DefinitionRegistrationOptions extends TextDocumentRegistrationOptions, DefinitionOptions {
+export interface DefinitionRegistrationOptions
+	extends TextDocumentRegistrationOptions, DefinitionOptions {
 }
 ```
 
@@ -4033,7 +4121,9 @@ _Request_:
 * params: `DefinitionParams` defined as follows:
 
 ```typescript
-export interface DefinitionParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface DefinitionParams
+	extends TextDocumentPositionParams, WorkDoneProgressParams,
+		PartialResultParams {
 }
 ```
 
@@ -4057,9 +4147,10 @@ _Client Capability_:
 ```typescript
 export interface TypeDefinitionClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration. If this is set to `true`
-	 * the client supports the new `TypeDefinitionRegistrationOptions` return value
-	 * for the corresponding server capability as well.
+	 * Whether implementation supports dynamic registration.
+	 * If this is set to `true`, the client supports the new `
+	 * TypeDefinitionRegistrationOptions` return value for the
+	 * corresponding server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 
@@ -4083,7 +4174,9 @@ export interface TypeDefinitionOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `TypeDefinitionRegistrationOptions` defined as follows:
 ```typescript
-export interface TypeDefinitionRegistrationOptions extends TextDocumentRegistrationOptions, TypeDefinitionOptions, StaticRegistrationOptions {
+export interface TypeDefinitionRegistrationOptions
+	extends TextDocumentRegistrationOptions, TypeDefinitionOptions,
+		StaticRegistrationOptions {
 }
 ```
 
@@ -4092,7 +4185,9 @@ _Request_:
 * params: `TypeDefinitionParams` defined as follows:
 
 ```typescript
-export interface TypeDefinitionParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface TypeDefinitionParams
+	extends TextDocumentPositionParams, WorkDoneProgressParams,
+		PartialResultParams {
 }
 ```
 
@@ -4116,9 +4211,10 @@ _Client Capability_:
 ```typescript
 export interface ImplementationClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration. If this is set to `true`
-	 * the client supports the new `ImplementationRegistrationOptions` return value
-	 * for the corresponding server capability as well.
+	 * Whether implementation supports dynamic registration.
+	 * If this is set to `true`, the client supports the new
+	 * `ImplementationRegistrationOptions` return value for the
+	 * corresponding server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 
@@ -4142,7 +4238,9 @@ export interface ImplementationOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `ImplementationRegistrationOptions` defined as follows:
 ```typescript
-export interface ImplementationRegistrationOptions extends TextDocumentRegistrationOptions, ImplementationOptions, StaticRegistrationOptions {
+export interface ImplementationRegistrationOptions
+	extends TextDocumentRegistrationOptions, ImplementationOptions,
+		StaticRegistrationOptions {
 }
 ```
 
@@ -4151,7 +4249,8 @@ _Request_:
 * params: `ImplementationParams` defined as follows:
 
 ```typescript
-export interface ImplementationParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface ImplementationParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -4188,7 +4287,8 @@ export interface ReferenceOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `ReferenceRegistrationOptions` defined as follows:
 ```typescript
-export interface ReferenceRegistrationOptions extends TextDocumentRegistrationOptions, ReferenceOptions {
+export interface ReferenceRegistrationOptions
+	extends TextDocumentRegistrationOptions, ReferenceOptions {
 }
 ```
 
@@ -4197,7 +4297,8 @@ _Request_:
 * params: `ReferenceParams` defined as follows:
 
 ```typescript
-export interface ReferenceParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface ReferenceParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 	context: ReferenceContext
 }
 
@@ -4244,7 +4345,8 @@ export interface DocumentHighlightOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentHighlightRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentHighlightRegistrationOptions extends TextDocumentRegistrationOptions, DocumentHighlightOptions {
+export interface DocumentHighlightRegistrationOptions
+	extends TextDocumentRegistrationOptions, DocumentHighlightOptions {
 }
 ```
 
@@ -4253,7 +4355,8 @@ _Request_:
 * params: `DocumentHighlightParams` defined as follows:
 
 ```typescript
-export interface DocumentHighlightParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface DocumentHighlightParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -4322,7 +4425,8 @@ export interface DocumentSymbolClientCapabilities {
 	dynamicRegistration?: boolean;
 
 	/**
-	 * Specific capabilities for the `SymbolKind` in the `textDocument/documentSymbol` request.
+	 * Specific capabilities for the `SymbolKind` in the
+	 * `textDocument/documentSymbol` request.
 	 */
 	symbolKind?: {
 		/**
@@ -4356,7 +4460,8 @@ export interface DocumentSymbolOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentSymbolRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentSymbolRegistrationOptions extends TextDocumentRegistrationOptions, DocumentSymbolOptions {
+export interface DocumentSymbolRegistrationOptions
+	extends TextDocumentRegistrationOptions, DocumentSymbolOptions {
 }
 ```
 
@@ -4365,7 +4470,8 @@ _Request_:
 * params: `DocumentSymbolParams` defined as follows:
 
 ```typescript
-export interface DocumentSymbolParams extends WorkDoneProgressParams, PartialResultParams {
+export interface DocumentSymbolParams
+	extends WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -4410,14 +4516,16 @@ export namespace SymbolKind {
 }
 
 /**
- * Represents programming constructs like variables, classes, interfaces etc. that appear in a document. Document symbols can be
- * hierarchical and they have two ranges: one that encloses its definition and one that points to its most interesting range,
- * e.g. the range of an identifier.
+ * Represents programming constructs like variables, classes, interfaces etc.
+ * that appear in a document. Document symbols can be hierarchical and they
+ * have two ranges: one that encloses its definition and one that points to
+ * its most interesting range, for example, the range of an identifier.
  */
 export interface DocumentSymbol {
 
 	/**
-	 * The name of this symbol. Will be displayed in the user interface and therefore must not be
+	 * The name of this symbol.
+	 * Will be displayed in the user interface and therefore must not be
 	 * an empty string or a string only consisting of white spaces.
 	 */
 	name: string;
@@ -4438,14 +4546,16 @@ export interface DocumentSymbol {
 	deprecated?: boolean;
 
 	/**
-	 * The range enclosing this symbol not including leading/trailing whitespace but everything else
-	 * like comments. This information is typically used to determine if the clients cursor is
-	 * inside the symbol to reveal in the symbol in the UI.
+	 * The range enclosing this symbol not including leading/trailing
+	 * whitespace but everything else like comments.
+	 * This information is typically used to determine if the client's cursor
+	 * is inside the symbol to reveal in the symbol in the UI.
 	 */
 	range: Range;
 
 	/**
-	 * The range that should be selected and revealed when this symbol is being picked, e.g the name of a function.
+	 * The range that should be selected and revealed when this symbol
+	 * is being picked, for example, the name of a function.
 	 * Must be contained by the `range`.
 	 */
 	selectionRange: Range;
@@ -4566,8 +4676,8 @@ export interface CodeActionOptions extends WorkDoneProgressOptions {
 	/**
 	 * CodeActionKinds that this server may return.
 	 *
-	 * The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the server
-	 * may list out every specific kind they provide.
+	 * The list of kinds may be generic, such as `CodeActionKind.Refactor`,
+	 * or the server may list out every specific kind they provide.
 	 */
 	codeActionKinds?: CodeActionKind[];
 }
@@ -4575,7 +4685,8 @@ export interface CodeActionOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `CodeActionRegistrationOptions` defined as follows:
 ```typescript
-export interface CodeActionRegistrationOptions extends TextDocumentRegistrationOptions, CodeActionOptions {
+export interface CodeActionRegistrationOptions
+	extends TextDocumentRegistrationOptions, CodeActionOptions {
 }
 ```
 
@@ -4587,7 +4698,8 @@ _Request_:
 /**
  * Params for the CodeActionRequest
  */
-export interface CodeActionParams extends WorkDoneProgressParams, PartialResultParams {
+export interface CodeActionParams
+	extends WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * The document in which the command was invoked.
 	 */
@@ -4607,10 +4719,11 @@ export interface CodeActionParams extends WorkDoneProgressParams, PartialResultP
 /**
  * The kind of a code action.
  *
- * Kinds are a hierarchical list of identifiers separated by `.`, e.g. `"refactor.extract.function"`.
+ * Kinds are a hierarchical list of identifiers separated by `.`,
+ * e.g. `"refactor.extract.function"`.
  *
- * The set of kinds is open and client needs to announce the kinds it supports to the server during
- * initialization.
+ * The set of kinds is open and the client needs to announce the kinds it
+ * supports to the server during initialization.
  */
 export type CodeActionKind = string;
 
@@ -4681,9 +4794,10 @@ export namespace CodeActionKind {
 	export const Source: CodeActionKind = 'source';
 
 	/**
-	 * Base kind for an organize imports source action: `source.organizeImports`.
+	 * Base kind for an organize imports source action `source.organizeImports`.
 	 */
-	export const SourceOrganizeImports: CodeActionKind = 'source.organizeImports';
+	export const SourceOrganizeImports: CodeActionKind
+		= 'source.organizeImports';
 }
 
 /**
@@ -4692,19 +4806,20 @@ export namespace CodeActionKind {
  */
 export interface CodeActionContext {
 	/**
-	 * An array of diagnostics known on the client side overlapping the range provided to the
-	 * `textDocument/codeAction` request. They are provided so that the server knows which
-	 * errors are currently presented to the user for the given range. There is no guarantee
-	 * that these accurately reflect the error state of the resource. The primary parameter
-	 * to compute code actions is the provided range.
+	 * An array of diagnostics known on the client side overlapping the range
+	 * provided to the `textDocument/codeAction` request.
+	 * They are provided so that the server knows which errors are currently
+	 * presented to the user for the given range. There is no guarantee that
+	 * these accurately reflect the error state of the resource.
+	 * The primary parameter to compute code actions is the provided range.
 	 */
 	diagnostics: Diagnostic[];
 
 	/**
 	 * Requested kind of actions to return.
 	 *
-	 * Actions not of this kind are filtered out by the client before being shown. So servers
-	 * can omit computing them.
+	 * Actions not of this kind are filtered out by the client before
+	 * being shown, so servers can omit computing them.
 	 */
 	only?: CodeActionKind[];
 }
@@ -4715,10 +4830,12 @@ _Response_:
 
 ```typescript
 /**
- * A code action represents a change that can be performed in code, e.g. to fix a problem or
- * to refactor code.
+ * A code action represents a change that can be performed in code.
+ * For example, to fix a problem or to refactor code.
  *
- * A CodeAction must set either `edit` and/or a `command`. If both are supplied, the `edit` is applied first, then the `command` is executed.
+ * A CodeAction must set either `edit` and/or a `command`.
+ * If both are supplied, the `edit` is applied first, then the `command`
+ * is executed.
  */
 export interface CodeAction {
 
@@ -4740,11 +4857,14 @@ export interface CodeAction {
 	diagnostics?: Diagnostic[];
 
 	/**
-	 * Marks this as a preferred action. Preferred actions are used by the `auto fix` command and can be targeted
-	 * by keybindings.
+	 * Marks this as a preferred action.
+	 * Preferred actions are used by the `auto fix` command and can be
+	 * targeted by keybindings.
 	 *
-	 * A quick fix should be marked preferred if it properly addresses the underlying error.
-	 * A refactoring should be marked preferred if it is the most reasonable choice of actions to take.
+	 * A quick fix should be marked preferred if it properly addresses the
+	 * underlying error.
+	 * A refactoring should be marked preferred if it is the most reasonable
+	 * choice of actions to take.
 	 *
 	 * @since 3.15.0
 	 */
@@ -4768,7 +4888,7 @@ export interface CodeAction {
 
 #### <a href="#textDocument_codeLens" name="textDocument_codeLens" class="anchor">Code Lens Request (:leftwards_arrow_with_hook:)</a>
 
-The code lens request is sent from the client to the server to compute code lenses for a given text document.
+The CodeLens request is sent from the client to the server to compute CodeLens for a given text document.
 
 _Client Capability_:
 * property name (optional): `textDocument.codeLens`
@@ -4777,7 +4897,7 @@ _Client Capability_:
 ```typescript
 export interface CodeLensClientCapabilities {
 	/**
-	 * Whether code lens supports dynamic registration.
+	 * Whether CodeLens supports dynamic registration.
 	 */
 	dynamicRegistration?: boolean;
 }
@@ -4798,7 +4918,8 @@ export interface CodeLensOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `CodeLensRegistrationOptions` defined as follows:
 ```typescript
-export interface CodeLensRegistrationOptions extends TextDocumentRegistrationOptions, CodeLensOptions {
+export interface CodeLensRegistrationOptions
+	extends TextDocumentRegistrationOptions, CodeLensOptions {
 }
 ```
 
@@ -4809,7 +4930,7 @@ _Request_:
 ```typescript
 interface CodeLensParams extends WorkDoneProgressParams, PartialResultParams {
 	/**
-	 * The document to request code lens for.
+	 * The document to request CodeLens for.
 	 */
 	textDocument: TextDocumentIdentifier;
 }
@@ -4820,36 +4941,37 @@ _Response_:
 
 ```typescript
 /**
- * A code lens represents a command that should be shown along with
+ * A CodeLense represents a command that should be shown along with
  * source text, like the number of references, a way to run tests, etc.
  *
- * A code lens is _unresolved_ when no command is associated to it. For performance
- * reasons the creation of a code lens and resolving should be done in two stages.
+ * A CodeLens is _unresolved_ when no command is associated to it.
+ * For performance reasons, the creation of a CodeLens and resolving should
+ * be done in two stages.
  */
 interface CodeLens {
 	/**
-	 * The range in which this code lens is valid. Should only span a single line.
+	 * The range in which the CodeLens is valid. Should only span a single line.
 	 */
 	range: Range;
 
 	/**
-	 * The command this code lens represents.
+	 * The command this CodeLens represents.
 	 */
 	command?: Command;
 
 	/**
-	 * A data entry field that is preserved on a code lens item between
-	 * a code lens and a code lens resolve request.
+	 * A data entry field that is preserved on a CodeLens item between
+	 * a CodeLens and a CodeLens resolve request.
 	 */
 	data?: any
 }
 ```
 * partial result: `CodeLens[]`
-* error: code and message set in case an exception happens during the code lens request.
+* error: code and message set in case an exception happens during the CodeLens request.
 
 #### <a href="#codeLens_resolve" name="codeLens_resolve" class="anchor">Code Lens Resolve Request (:leftwards_arrow_with_hook:)</a>
 
-The code lens resolve request is sent from the client to the server to resolve the command for a given code lens item.
+The CodeLens resolve request is sent from the client to the server to resolve the command for a given CodeLens item.
 
 _Request_:
 * method: 'codeLens/resolve'
@@ -4857,7 +4979,7 @@ _Request_:
 
 _Response_:
 * result: `CodeLens`
-* error: code and message set in case an exception happens during the code lens resolve request.
+* error: code and message set in case an exception happens during the CodeLens resolve request.
 
 #### <a href="#textDocument_documentLink" name="textDocument_documentLink" class="anchor">Document Link Request (:leftwards_arrow_with_hook:)</a>
 
@@ -4898,7 +5020,8 @@ export interface DocumentLinkOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentLinkRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentLinkRegistrationOptions extends TextDocumentRegistrationOptions, DocumentLinkOptions {
+export interface DocumentLinkRegistrationOptions
+	extends TextDocumentRegistrationOptions, DocumentLinkOptions {
 }
 ```
 
@@ -4907,7 +5030,8 @@ _Request_:
 * params: `DocumentLinkParams` defined as follows:
 
 ```typescript
-interface DocumentLinkParams extends WorkDoneProgressParams, PartialResultParams {
+interface DocumentLinkParams
+	extends WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * The document to provide document links for.
 	 */
@@ -4920,8 +5044,8 @@ _Response_:
 
 ```typescript
 /**
- * A document link is a range in a text document that links to an internal or external resource, like another
- * text document or a web site.
+ * A document link is a range in a text document that links to an internal
+ * or external resource, like another text document or a web site.
  */
 interface DocumentLink {
 	/**
@@ -4937,9 +5061,11 @@ interface DocumentLink {
 	/**
 	 * The tooltip text when you hover over this link.
 	 *
-	 * If a tooltip is provided, is will be displayed in a string that includes instructions on how to
-	 * trigger the link, such as `{0} (ctrl + click)`. The specific instructions vary depending on OS,
-	 * user settings, and localization.
+	 * If a tooltip is provided, it will be displayed in a string that
+	 * includes instructions on how to trigger the link,
+	 * such as `{0} (ctrl + click)`.
+	 * The specific instructions vary depending on OS, user settings,
+	 * and localization.
 	 *
 	 * @since 3.15.0
 	 */
@@ -5001,7 +5127,9 @@ export interface DocumentColorOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentColorRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentColorRegistrationOptions extends TextDocumentRegistrationOptions, StaticRegistrationOptions, DocumentColorOptions {
+export interface DocumentColorRegistrationOptions
+	extends TextDocumentRegistrationOptions, StaticRegistrationOptions,
+		DocumentColorOptions {
 }
 ```
 
@@ -5011,7 +5139,8 @@ _Request_:
 * params: `DocumentColorParams` defined as follows
 
 ```typescript
-interface DocumentColorParams extends WorkDoneProgressParams, PartialResultParams {
+interface DocumentColorParams
+	extends WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -5080,7 +5209,8 @@ _Request_:
 * params: `ColorPresentationParams` defined as follows
 
 ```typescript
-interface ColorPresentationParams extends WorkDoneProgressParams, PartialResultParams {
+interface ColorPresentationParams
+	extends WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -5105,19 +5235,22 @@ _Response_:
 interface ColorPresentation {
 	/**
 	 * The label of this color presentation. It will be shown on the color
-	 * picker header. By default this is also the text that is inserted when selecting
+	 * picker header.
+	 * By default, this is also the text that is inserted when selecting
 	 * this color presentation.
 	 */
 	label: string;
 	/**
 	 * An [edit](#TextEdit) which is applied to a document when selecting
-	 * this presentation for the color.  When `falsy` the [label](#ColorPresentation.label)
-	 * is used.
+	 * this presentation for the color.
+	 * When `falsy`, the [label](#ColorPresentation.label) is used.
 	 */
 	textEdit?: TextEdit;
 	/**
-	 * An optional array of additional [text edits](#TextEdit) that are applied when
-	 * selecting this color presentation. Edits must not overlap with the main [edit](#ColorPresentation.textEdit) nor with themselves.
+	 * An optional array of additional [text edits](#TextEdit) that are
+	 * applied when selecting this color presentation.
+	 * Edits must not overlap with the main [edit](#ColorPresentation.textEdit)
+	 * nor with themselves.
 	 */
 	additionalTextEdits?: TextEdit[];
 }
@@ -5154,7 +5287,8 @@ export interface DocumentFormattingOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentFormattingRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentFormattingRegistrationOptions extends TextDocumentRegistrationOptions, DocumentFormattingOptions {
+export interface DocumentFormattingRegistrationOptions
+	extends TextDocumentRegistrationOptions, DocumentFormattingOptions {
 }
 ```
 
@@ -5243,13 +5377,15 @@ _Server Capability_:
 * property type: `boolean | DocumentRangeFormattingOptions` where `DocumentRangeFormattingOptions` is defined as follows:
 
 ```typescript
-export interface DocumentRangeFormattingOptions extends WorkDoneProgressOptions {
+export interface DocumentRangeFormattingOptions
+	extends WorkDoneProgressOptions {
 }
 ```
 
 _Registration Options_: `DocumentFormattingRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentRangeFormattingRegistrationOptions extends TextDocumentRegistrationOptions, DocumentRangeFormattingOptions {
+export interface DocumentRangeFormattingRegistrationOptions
+	extends TextDocumentRegistrationOptions, DocumentRangeFormattingOptions {
 }
 ```
 
@@ -5317,7 +5453,8 @@ export interface DocumentOnTypeFormattingOptions {
 
 _Registration Options_: `DocumentOnTypeFormattingRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentOnTypeFormattingRegistrationOptions extends TextDocumentRegistrationOptions, DocumentOnTypeFormattingOptions {
+export interface DocumentOnTypeFormattingRegistrationOptions
+	extends TextDocumentRegistrationOptions, DocumentOnTypeFormattingOptions {
 }
 ```
 
@@ -5385,7 +5522,8 @@ export interface RenameOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `RenameRegistrationOptions` defined as follows:
 ```typescript
-export interface RenameRegistrationOptions extends TextDocumentRegistrationOptions, RenameOptions {
+export interface RenameRegistrationOptions
+	extends TextDocumentRegistrationOptions, RenameOptions {
 }
 ```
 
@@ -5394,7 +5532,8 @@ _Request_:
 * params: `RenameParams` defined as follows
 
 ```typescript
-interface RenameParams extends TextDocumentPositionParams, WorkDoneProgressParams {
+interface RenameParams
+	extends TextDocumentPositionParams, WorkDoneProgressParams {
 	/**
 	 * The new name of the symbol. If the given name is not valid the
 	 * request must return a [ResponseError](#ResponseError) with an
@@ -5439,19 +5578,23 @@ _Client Capability_:
 ```typescript
 export interface FoldingRangeClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration for folding range providers. If this is set to `true`
-	 * the client supports the new `FoldingRangeRegistrationOptions` return value for the corresponding server
-	 * capability as well.
+	 * Whether the implementation supports dynamic registration for
+	 * folding range providers.
+	 * If this is set to `true`, the client supports the new
+	 * `FoldingRangeRegistrationOptions` return value for the corresponding
+	 * server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 	/**
-	 * The maximum number of folding ranges that the client prefers to receive per document. The value serves as a
-	 * hint, servers are free to follow the limit.
+	 * The maximum number of folding ranges that the client prefers to
+	 * receive per document.
+	 * The value serves as a hint, servers are free to follow the limit.
 	 */
 	rangeLimit?: number;
 	/**
-	 * If set, the client signals that it only supports folding complete lines. If set, client will
-	 * ignore specified `startCharacter` and `endCharacter` properties in a FoldingRange.
+	 * If set, the client signals that it only supports folding complete lines.
+	 * If set, the client will ignore specified `startCharacter` and
+	 * `endCharacter` properties in a FoldingRange.
 	 */
 	lineFoldingOnly?: boolean;
 }
@@ -5468,7 +5611,9 @@ export interface FoldingRangeOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `FoldingRangeRegistrationOptions` defined as follows:
 ```typescript
-export interface FoldingRangeRegistrationOptions extends TextDocumentRegistrationOptions, FoldingRangeOptions, StaticRegistrationOptions {
+export interface FoldingRangeRegistrationOptions
+	extends TextDocumentRegistrationOptions, FoldingRangeOptions,
+		StaticRegistrationOptions {
 }
 ```
 
@@ -5478,7 +5623,8 @@ _Request_:
 * params: `FoldingRangeParams` defined as follows
 
 ```typescript
-export interface FoldingRangeParams extends WorkDoneProgressParams, PartialResultParams {
+export interface FoldingRangeParams
+	extends WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -5519,7 +5665,8 @@ export interface FoldingRange {
 	startLine: number;
 
 	/**
-	 * The zero-based character offset from where the folded range starts. If not defined, defaults to the length of the start line.
+	 * The zero-based character offset from where the folded range starts.
+	 * If not defined, defaults to the length of the start line.
 	 */
 	startCharacter?: number;
 
@@ -5529,14 +5676,17 @@ export interface FoldingRange {
 	endLine: number;
 
 	/**
-	 * The zero-based character offset before the folded range ends. If not defined, defaults to the length of the end line.
+	 * The zero-based character offset before the folded range ends.
+	 * If not defined, defaults to the length of the end line.
 	 */
 	endCharacter?: number;
 
 	/**
-	 * Describes the kind of the folding range such as `comment` or `region`. The kind
-	 * is used to categorize folding ranges and used by commands like 'Fold all comments'. See
-	 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of standardized kinds.
+	 * Describes the kind of the folding range such as `comment` or `region`.
+	 * The kind is used to categorize folding ranges and used by commands
+	 * like 'Fold all comments'.
+	 * See [FoldingRangeKind](#FoldingRangeKind) for an enumeration of
+	 * standardized kinds.
 	 */
 	kind?: string;
 }
@@ -5562,9 +5712,11 @@ _Client Capability_:
 ```typescript
 export interface SelectionRangeClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration for selection range providers. If this is set to `true`
-	 * the client supports the new `SelectionRangeRegistrationOptions` return value for the corresponding server
-	 * capability as well.
+	 * Whether implementation supports dynamic registration for selection
+	 * range providers.
+	 * If set to `true`, the client supports the new
+	 * `SelectionRangeRegistrationOptions` return value for the corresponding
+	 * server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 }
@@ -5581,7 +5733,9 @@ export interface SelectionRangeOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `SelectionRangeRegistrationOptions` defined as follows:
 ```typescript
-export interface SelectionRangeRegistrationOptions extends SelectionRangeOptions, TextDocumentRegistrationOptions, StaticRegistrationOptions {
+export interface SelectionRangeRegistrationOptions
+	extends SelectionRangeOptions, TextDocumentRegistrationOptions,
+		StaticRegistrationOptions {
 }
 ```
 
@@ -5591,7 +5745,8 @@ _Request_:
 * params: `SelectionRangeParams` defined as follows
 
 ```typescript
-export interface SelectionRangeParams extends WorkDoneProgressParams, PartialResultParams {
+export interface SelectionRangeParams
+	extends WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -5609,14 +5764,17 @@ _Response_:
 
 ```typescript
 export interface SelectionRange {
-    /**
-     * The [range](#Range) of this selection range.
-     */
-    range: Range;
-    /**
-     * The parent selection range containing this range. Therefore `parent.range` must contain `this.range`.
-     */
-    parent?: SelectionRange;
+	/**
+	 * The [range](#Range) of this selection range.
+	 */
+	range: Range;
+
+	/**
+	 * The parent selection range containing this range.
+	 * Therefore `parent.range` must
+	 * contain `this.range`.
+	 */
+	parent?: SelectionRange;
 }
 ```
 
diff --git a/_specifications/specification-3-16.md b/_specifications/specification-3-16.md
index b9f2fb7cb..cfad2e1a2 100644
--- a/_specifications/specification-3-16.md
+++ b/_specifications/specification-3-16.md
@@ -23,6 +23,8 @@ All new 3.16 features are tagged with a corresponding since version 3.16 text or
 - Code Action disabled support
 - Code Action resolve support
 
+The version of the specification is used to group features into a new specification release and to refer to their first appearance. Features in the spec are kept compatible using so called capability flags which are exchanged between the client and the server during initialization.
+
 ## <a href="#baseProtocol" name="baseProtocol" class="anchor"> Base Protocol </a>
 
 The base protocol consists of a header and a content part (comparable to HTTP). The header and content part are
@@ -66,6 +68,35 @@ Content-Length: ...\r\n
 
 The following TypeScript definitions describe the base [JSON-RPC protocol](http://www.jsonrpc.org/specification):
 
+#### <a href="#number" name="number" class="anchor"> Numbers </a>
+
+The protocol use the following definitions for integers, unsigned integers and decimal numbers:
+
+```typescript
+/**
+ * Defines an integer number in the range of -2^31 to 2^31 - 1.
+ */
+export type integer = number;
+```
+
+```typescript
+/**
+ * Defines an unsigned integer number in the range of 0 to 2^31 - 1.
+ */
+export type uinteger = number;
+```
+
+```typescript
+/**
+ * Defines a decimal number. Since decimal numbers are very
+ * rare in the language server specification we denote the
+ * exact range with every decimal using the mathematics
+ * interval notation (e.g. [0, 1] denotes all decimals d with
+ * 0 <= d <= 1.
+ */
+export type decimal = number;
+```
+
 #### Abstract Message
 
 A general message as defined by JSON-RPC. The language server protocol always uses "2.0" as the `jsonrpc` version.
@@ -85,7 +116,7 @@ interface RequestMessage extends Message {
 	/**
 	 * The request id.
 	 */
-	id: number | string;
+	id: integer | string;
 
 	/**
 	 * The method to be invoked.
@@ -108,7 +139,7 @@ interface ResponseMessage extends Message {
 	/**
 	 * The request id.
 	 */
-	id: number | string | null;
+	id: integer | string | null;
 
 	/**
 	 * The result of a request. This member is REQUIRED on success.
@@ -126,7 +157,7 @@ interface ResponseError {
 	/**
 	 * A number indicating the error type that occurred.
 	 */
-	code: number;
+	code: integer;
 
 	/**
 	 * A string providing a short description of the error.
@@ -142,11 +173,11 @@ interface ResponseError {
 
 export namespace ErrorCodes {
 	// Defined by JSON RPC
-	export const ParseError: number = -32700;
-	export const InvalidRequest: number = -32600;
-	export const MethodNotFound: number = -32601;
-	export const InvalidParams: number = -32602;
-	export const InternalError: number = -32603;
+	export const ParseError: integer = -32700;
+	export const InvalidRequest: integer = -32600;
+	export const MethodNotFound: integer = -32601;
+	export const InvalidParams: integer = -32602;
+	export const InternalError: integer = -32603;
 
 	/**
 	 * This is the start range of JSON RPC reserved error codes.
@@ -157,12 +188,12 @@ export namespace ErrorCodes {
 	 *
 	 * @since 3.16.0
 	*/
-	export const jsonrpcReservedErrorRangeStart: number = -32099;
+	export const jsonrpcReservedErrorRangeStart: integer = -32099;
 	/** @deprecated use  jsonrpcReservedErrorRangeStart */
-	export const serverErrorStart: number = jsonrpcReservedErrorRangeStart;
+	export const serverErrorStart: integer = jsonrpcReservedErrorRangeStart;
 
-	export const ServerNotInitialized: number = -32002;
-	export const UnknownErrorCode: number = -32001;
+	export const ServerNotInitialized: integer = -32002;
+	export const UnknownErrorCode: integer = -32001;
 
 	/**
 	 * This is the start range of JSON RPC reserved error codes.
@@ -170,7 +201,7 @@ export namespace ErrorCodes {
 	*/
 	export const jsonrpcReservedErrorRangeEnd = -32000;
 	/** @deprecated use  jsonrpcReservedErrorRangeEnd */
-	export const serverErrorEnd: number = jsonrpcReservedErrorRangeEnd;
+	export const serverErrorEnd: integer = jsonrpcReservedErrorRangeEnd;
 
 	/**
 	 * This is the start range of LSP reserved error codes.
@@ -178,10 +209,10 @@ export namespace ErrorCodes {
 	 *
 	 * @since 3.16.0
 	 */
-	export const lspReservedErrorRangeStart: number = -32899;
+	export const lspReservedErrorRangeStart: integer = -32899;
 
-	export const ContentModified: number = -32801;
-	export const RequestCancelled: number = -32800;
+	export const ContentModified: integer = -32801;
+	export const RequestCancelled: integer = -32800;
 
 	/**
 	 * This is the end range of LSP reserved error codes.
@@ -189,7 +220,7 @@ export namespace ErrorCodes {
 	 *
 	 * @since 3.16.0
 	 */
-	export const lspReservedErrorRangeEnd: number = -32800;
+	export const lspReservedErrorRangeEnd: integer = -32800;
 }
 ```
 #### <a href="#notificationMessage" name="notificationMessage" class="anchor"> Notification Message </a>
@@ -212,7 +243,7 @@ interface NotificationMessage extends Message {
 
 #### <a href="#dollarRequests" name="dollarRequests" class="anchor"> $ Notifications and Requests </a>
 
-Notification and requests whose methods start with '$/' are messages which are protocol implementation dependent and might not be implementable in all clients or servers. For example if the server implementation uses a single threaded synchronous programming language then there is little a server can do to react to a '$/cancelRequest' notification. If a server or client receives notifications starting with '$/' it is free to ignore the notification. If a server or client receives a requests starting with '$/' it must error the request with error code `MethodNotFound` (e.g. `-32601`).
+Notification and requests whose methods start with '\$/' are messages which are protocol implementation dependent and might not be implementable in all clients or servers. For example if the server implementation uses a single threaded synchronous programming language then there is little a server can do to react to a `$/cancelRequest` notification. If a server or client receives notifications starting with '\$/' it is free to ignore the notification. If a server or client receives a requests starting with '\$/' it must error the request with error code `MethodNotFound` (e.g. `-32601`).
 
 #### <a href="#cancelRequest" name="cancelRequest" class="anchor"> Cancellation Support (:arrow_right: :arrow_left:)</a>
 
@@ -227,7 +258,7 @@ interface CancelParams {
 	/**
 	 * The request id to cancel.
 	 */
-	id: number | string;
+	id: integer | string;
 }
 ```
 
@@ -246,7 +277,8 @@ _Notification_:
 * params: `ProgressParams` defined as follows:
 
 ```typescript
-type ProgressToken = number | string;
+type ProgressToken = integer | string;
+
 interface ProgressParams<T> {
 	/**
 	 * The progress token provided by the client or server.
@@ -276,6 +308,10 @@ The protocol currently assumes that one server serves one tool. There is current
 
 URI's are transferred as strings. The URI's format is defined in [http://tools.ietf.org/html/rfc3986](http://tools.ietf.org/html/rfc3986)
 
+```typescript
+type URI = string;
+```
+
 ```
   foo://example.com:8042/over/there?name=ferret#nose
   \_/   \______________/\_________/ \_________/ \__/
@@ -294,6 +330,54 @@ Many of the interfaces contain fields that correspond to the URI of a document.
 type DocumentUri = string;
 ```
 
+#### <a href="#regExp" name="regExp" class="anchor"> Regular Expressions </a>
+
+Regular expression are a powerful tool and there are actual use cases for them in the language server protocol. However the downside with them is that almost every programming language has its own set of regular expression features so the specification can not simply refer to them as a regular expression. So the LSP uses a two step approach to support regular expressions:
+
+* the client will announce which regular expression engine it will use. This will allow server that are written for a very specific client make full use of the regular expression capabilities of the client
+* the specification will define a set of regular expression features that should be supported by a client. Instead of writing a new specification LSP will refer to the [ECMAScript Regular Expression specification](https://tc39.es/ecma262/#sec-regexp-regular-expression-objects) and remove features from it that are not necessary in the context of LSP or hard to implement for other clients.
+
+_Client Capability_:
+
+The following client capability is used to announce a client's regular expression engine
+
+* property path (optional): `general.regularExpressions`
+* property type: `RegularExpressionsClientCapabilities` defined as follows:
+
+```typescript
+/**
+ * Client capabilities specific to regular expressions.
+ */
+export interface RegularExpressionsClientCapabilities {
+	/**
+	 * The engine's name.
+	 */
+	engine: string;
+
+	/**
+	 * The engine's version.
+	 */
+	version?: string;
+}
+```
+
+The following table lists the well known engine values. Please note that the table should be driven by the community which integrates LSP into existing clients. It is not the goal of the spec to list all available regular expression engines.
+
+Engine | Version | Documentation
+------- | ------- | -------------
+ECMAScript | `ES2020` | [ECMAScript 2020](https://tc39.es/ecma262/#sec-regexp-regular-expression-objects) & [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions)
+
+_Regular Expression Subset_:
+
+The following features from the [ECMAScript 2020](https://tc39.es/ecma262/#sec-regexp-regular-expression-objects) regular expression specification are NOT mandatory for a client:
+
+- *Assertions*: Lookahead assertion, Negative lookahead assertion, lookbehind assertion, negative lookbehind assertion.
+- *Character classes*: matching control characters using caret notation (e.g. `\cX`) and matching UTF-16 code units (e.g. `\uhhhh`).
+- *Group and ranges*: named capturing groups.
+- *Unicode property escapes*: none of the features needs to be supported.
+
+The only regular expression flag that a client needs to support is 'i' to specify a case insensitive search.
+
 #### <a href="#textDocuments" name="textDocuments" class="anchor"> Text Documents </a>
 
 The current protocol is tailored for textual documents whose content can be represented as a string. There is currently no support for binary documents. A position inside a document (see Position definition below) is expressed as a zero-based line and character offset. The offsets are based on a UTF-16 string representation. So a string of the form `a𐐀b` the character offset of the character `a` is 0, the character offset of `𐐀` is 1 and the character offset of b is 3 since `𐐀` is represented using two code units in UTF-16. To ensure that both client and server split the string into the same line representation the protocol specifies the following end-of-line sequences: '\n', '\r\n' and '\r'.
@@ -313,17 +397,17 @@ interface Position {
 	/**
 	 * Line position in a document (zero-based).
 	 */
-	line: number;
+	line: uinteger;
 
 	/**
-	 * Character offset on a line in a document (zero-based). Assuming that the line is
-	 * represented as a string, the `character` value represents the gap between the
-	 * `character` and `character + 1`.
+	 * Character offset on a line in a document (zero-based). Assuming that
+	 * the line is represented as a string, the `character` value represents
+	 * the gap between the `character` and `character + 1`.
 	 *
-	 * If the character value is greater than the line length it defaults back to the
-	 * line length.
+	 * If the character value is greater than the line length it defaults back
+	 * to the line length.
 	 */
-	character: number;
+	character: uinteger;
 }
 ```
 #### <a href="#range" name="range" class="anchor"> Range </a>
@@ -370,8 +454,8 @@ interface LocationLink {
 	/**
 	 * Span of the origin of this link.
 	 *
-	 * Used as the underlined span for mouse interaction. Defaults to the word range at
-	 * the mouse position.
+	 * Used as the underlined span for mouse interaction. Defaults to the word
+	 * range at the mouse position.
 	 */
 	originSelectionRange?: Range;
 
@@ -381,15 +465,17 @@ interface LocationLink {
 	targetUri: DocumentUri;
 
 	/**
-	 * The full target range of this link. If the target for example is a symbol then target range is the
-	 * range enclosing this symbol not including leading/trailing whitespace but everything else
-	 * like comments. This information is typically used to highlight the range in the editor.
+	 * The full target range of this link. If the target for example is a symbol
+	 * then target range is the range enclosing this symbol not including
+	 * leading/trailing whitespace but everything else like comments. This
+	 * information is typically used to highlight the range in the editor.
 	 */
 	targetRange: Range;
 
 	/**
-	 * The range that should be selected and revealed when this link is being followed, e.g the name of a function.
-	 * Must be contained by the the `targetRange`. See also `DocumentSymbol#range`
+	 * The range that should be selected and revealed when this link is being
+	 * followed, e.g the name of a function. Must be contained by the the
+	 * `targetRange`. See also `DocumentSymbol#range`
 	 */
 	targetSelectionRange: Range;
 }
@@ -415,7 +501,14 @@ export interface Diagnostic {
 	/**
 	 * The diagnostic's code, which might appear in the user interface.
 	 */
-	code?: number | string;
+	code?: integer | string;
+
+	/**
+	 * An optional property to describe the error code.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	codeDescription?: CodeDescription;
 
 	/**
 	 * A human-readable string describing the source of this
@@ -440,6 +533,15 @@ export interface Diagnostic {
 	 * a scope collide all definitions can be marked via this property.
 	 */
 	relatedInformation?: DiagnosticRelatedInformation[];
+
+	/**
+	 * A data entry field that is preserved between a
+	 * `textDocument/publishDiagnostics` notification and
+	 * `textDocument/codeAction` request.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	data?: unknown;
 }
 ```
 
@@ -476,8 +578,8 @@ export namespace DiagnosticTag {
     /**
      * Unused or unnecessary code.
      *
-     * Clients are allowed to render diagnostics with this tag faded out instead of having
-     * an error squiggle.
+     * Clients are allowed to render diagnostics with this tag faded out
+	 * instead of having an error squiggle.
      */
     export const Unnecessary: 1 = 1;
     /**
@@ -495,9 +597,9 @@ export type DiagnosticTag = 1 | 2;
 
 ```typescript
 /**
- * Represents a related message and source code location for a diagnostic. This should be
- * used to point to code locations that cause or are related to a diagnostics, e.g when duplicating
- * a symbol in a scope.
+ * Represents a related message and source code location for a diagnostic.
+ * This should be used to point to code locations that cause or are related to
+ * a diagnostics, e.g when duplicating a symbol in a scope.
  */
 export interface DiagnosticRelatedInformation {
 	/**
@@ -512,6 +614,22 @@ export interface DiagnosticRelatedInformation {
 }
 ```
 
+`CodeDescription` is defined as follows:
+
+```typescript
+/**
+ * Structure to capture a description for an error code.
+ *
+ * @since 3.16.0 - proposed state
+ */
+export interface CodeDescription {
+	/**
+	 * An URI to open with more information about the diagnostic error.
+	 */
+	href: URI;
+}
+```
+
 #### <a href="#command" name="command" class="anchor"> Command </a>
 
 Represents a reference to a command. Provides a title which will be used to represent a command in the UI. Commands are identified by a string identifier. The recommended way to handle commands is to implement their execution on the server side if the client and server provides the corresponding capabilities. Alternatively the tool extension code could handle the command. The protocol currently doesn't specify a set of well-known commands.
@@ -534,7 +652,9 @@ interface Command {
 }
 ```
 
-#### <a href="#textEdit" name="textEdit" class="anchor"> TextEdit </a>
+#### <a href="#textEdit" name="textEdit" class="anchor"> TextEdit  & AnnotatedTextEdit </a>
+
+> New in version 3.16: Support for `AnnotatedTextEdit`.
 
 A textual edit applicable to a text document.
 
@@ -554,33 +674,79 @@ interface TextEdit {
 }
 ```
 
+Since 3.16.0 there is also the concept of a annotated text edit which supports to add an annotation to a text edit. The annotation can add information describing the change to the text edit.
+
+```typescript
+/**
+ * Additional information that describes document changes.
+ *
+ * @since 3.16.0 - proposed state
+ */
+export interface ChangeAnnotation {
+	/**
+	 * A human-readable string describing the actual change. The string
+	 * is rendered prominent in the user interface.
+	 */
+	label: string;
+
+	/**
+	 * A flag which indicates that user confirmation is needed
+	 * before applying the change.
+	 */
+	needsConfirmation?: boolean;
+
+	/**
+	 * A human-readable string which is rendered less prominent in
+	 * the user interface.
+	 */
+	description?: string;
+}
+
+/**
+ * A special text edit with an additional change annotation.
+ *
+ * @since 3.16.0 - proposed state.
+ */
+export interface AnnotatedTextEdit extends TextEdit {
+	/**
+	 * The actual annotation
+	 */
+	annotation: ChangeAnnotation;
+}
+```
+
 #### <a href="#textEditArray" name="textEditArray" class="anchor"> TextEdit[] </a>
 
-Complex text manipulations are described with an array of `TextEdit`'s, representing a single change to the document.
+Complex text manipulations are described with an array of `TextEdit`'s or `AnnotatedTextEdit`'s, representing a single change to the document.
 
 All text edits ranges refer to positions in the document the are computed on. They therefore move a document from state S1 to S2 without describing any intermediate state. Text edits ranges must never overlap, that means no part of the original document must be manipulated by more than one edit. However, it is possible that multiple edits have the same start position: multiple inserts, or any number of inserts followed by a single remove or replace edit. If multiple inserts have the same position, the order in the array defines the order in which the inserted strings appear in the resulting text.
 
 #### <a href="#textDocumentEdit" name="textDocumentEdit" class="anchor"> TextDocumentEdit </a>
 
-Describes textual changes on a single text document. The text document is referred to as a `VersionedTextDocumentIdentifier` to allow clients to check the text document version before an edit is applied. A `TextDocumentEdit` describes all changes on a version Si and after they are applied move the document to version Si+1. So the creator of a `TextDocumentEdit` doesn't need to sort the array of edits or do any kind of ordering. However the edits must be non overlapping.
+> New in version 3.16: support for `AnnotatedTextEdit`. The support is guarded by the client capability `workspace.workspaceEdit.changeAnnotationSupport`. If a client doesn't signal the capability, servers shouldn't send `AnnotatedTextEdit` literals back to the client.
+
+Describes textual changes on a single text document. The text document is referred to as a `OptionalVersionedTextDocumentIdentifier` to allow clients to check the text document version before an edit is applied. A `TextDocumentEdit` describes all changes on a version Si and after they are applied move the document to version Si+1. So the creator of a `TextDocumentEdit` doesn't need to sort the array of edits or do any kind of ordering. However the edits must be non overlapping.
 
 ```typescript
 export interface TextDocumentEdit {
 	/**
 	 * The text document to change.
 	 */
-	textDocument: VersionedTextDocumentIdentifier;
+	textDocument: OptionalVersionedTextDocumentIdentifier;
 
 	/**
 	 * The edits to be applied.
+	 *
+	 * @since 3.16.0 - support for AnnotatedTextEdit. This is guarded by the
+	 * client capability `workspace.workspaceEdit.changeAnnotationSupport`
 	 */
-	edits: TextEdit[];
+	edits: (TextEdit | AnnotatedTextEdit)[];
 }
 ```
 
 ### <a href="#resourceChanges" name="resourceChanges" class="anchor"> File Resource changes </a>
 
-> New in version 3.13:
+> New in version 3.13. Since version 3.16 file resource changes can carry an additional property `changeAnnotation` to describe the actual change in more detail. Whether a client has support for change annotations is guarded by the client capability `workspace.workspaceEdit.changeAnnotationSupport`.
 
 File resource changes allow servers to create, rename and delete files and folders via the client. Note that the names talk about files but the operations are supposed to work on files and folders. This is in line with other naming in the Language Server Protocol (see file watchers which can watch files and folders). The corresponding change literals look as follows:
 
@@ -593,6 +759,7 @@ export interface CreateFileOptions {
 	 * Overwrite existing file. Overwrite wins over `ignoreIfExists`
 	 */
 	overwrite?: boolean;
+
 	/**
 	 * Ignore if exists.
 	 */
@@ -607,14 +774,23 @@ export interface CreateFile {
 	 * A create
 	 */
 	kind: 'create';
+
 	/**
 	 * The resource to create.
 	 */
 	uri: DocumentUri;
+
 	/**
 	 * Additional options
 	 */
 	options?: CreateFileOptions;
+
+	/**
+	 * An optional annotation describing the operation.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	annotation?: ChangeAnnotation;
 }
 
 /**
@@ -625,6 +801,7 @@ export interface RenameFileOptions {
 	 * Overwrite target if existing. Overwrite wins over `ignoreIfExists`
 	 */
 	overwrite?: boolean;
+
 	/**
 	 * Ignores if target exists.
 	 */
@@ -639,18 +816,28 @@ export interface RenameFile {
 	 * A rename
 	 */
 	kind: 'rename';
+
 	/**
 	 * The old (existing) location.
 	 */
 	oldUri: DocumentUri;
+
 	/**
 	 * The new location.
 	 */
 	newUri: DocumentUri;
+
 	/**
 	 * Rename options.
 	 */
 	options?: RenameFileOptions;
+
+	/**
+	 * An optional annotation describing the operation.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	annotation?: ChangeAnnotation;
 }
 
 /**
@@ -661,6 +848,7 @@ export interface DeleteFileOptions {
 	 * Delete the content recursively if a folder is denoted.
 	 */
 	recursive?: boolean;
+
 	/**
 	 * Ignore the operation if the file doesn't exist.
 	 */
@@ -675,14 +863,23 @@ export interface DeleteFile {
 	 * A delete
 	 */
 	kind: 'delete';
+
 	/**
 	 * The file to delete.
 	 */
 	uri: DocumentUri;
+
 	/**
 	 * Delete options.
 	 */
 	options?: DeleteFileOptions;
+
+	/**
+	 * An optional annotation describing the operation.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	annotation?: ChangeAnnotation;
 }
 ```
 
@@ -698,18 +895,24 @@ export interface WorkspaceEdit {
 	changes?: { [uri: DocumentUri]: TextEdit[]; };
 
 	/**
-	 * Depending on the client capability `workspace.workspaceEdit.resourceOperations` document changes
-	 * are either an array of `TextDocumentEdit`s to express changes to n different text documents
-	 * where each text document edit addresses a specific version of a text document. Or it can contain
-	 * above `TextDocumentEdit`s mixed with create, rename and delete file / folder operations.
+	 * Depending on the client capability
+	 * `workspace.workspaceEdit.resourceOperations` document changes are either
+	 * an array of `TextDocumentEdit`s to express changes to n different text
+	 * documents where each text document edit addresses a specific version of
+	 * a text document. Or it can contain above `TextDocumentEdit`s mixed with
+	 * create, rename and delete file / folder operations.
 	 *
 	 * Whether a client supports versioned document edits is expressed via
 	 * `workspace.workspaceEdit.documentChanges` client capability.
 	 *
-	 * If a client neither supports `documentChanges` nor `workspace.workspaceEdit.resourceOperations` then
-	 * only plain `TextEdit`s using the `changes` property are supported.
+	 * If a client neither supports `documentChanges` nor
+	 * `workspace.workspaceEdit.resourceOperations` then only plain `TextEdit`s
+	 * using the `changes` property are supported.
 	 */
-	documentChanges?: (TextDocumentEdit[] | (TextDocumentEdit | CreateFile | RenameFile | DeleteFile)[]);
+	documentChanges?: (
+		TextDocumentEdit[] |
+		(TextDocumentEdit | CreateFile | RenameFile | DeleteFile)[]
+	);
 }
 ```
 
@@ -745,6 +948,24 @@ export interface WorkspaceEditClientCapabilities {
 	 * @since 3.13.0
 	 */
 	failureHandling?: FailureHandlingKind;
+
+	/**
+	 * Whether the client normalizes line endings to the client specific
+	 * setting.
+	 * If set to `true` the client will normalize line ending characters
+	 * in a workspace edit to the client specific new line character(s).
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	normalizesLineEndings?: boolean;
+
+	/**
+	 * Whether the client in general supports change annotations on text edits,
+	 * create file, rename file and delete file changes.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	changeAnnotationSupport?: boolean;
 }
 
 /**
@@ -770,13 +991,15 @@ export namespace ResourceOperationKind {
 	export const Delete: ResourceOperationKind = 'delete';
 }
 
-export type FailureHandlingKind = 'abort' | 'transactional' | 'undo' | 'textOnlyTransactional';
+export type FailureHandlingKind = 'abort' | 'transactional' | 'undo'
+	| 'textOnlyTransactional';
 
 export namespace FailureHandlingKind {
 
 	/**
-	 * Applying the workspace change is simply aborted if one of the changes provided
-	 * fails. All operations executed before the failing operation stay executed.
+	 * Applying the workspace change is simply aborted if one of the changes
+	 * provided fails. All operations executed before the failing operation
+	 * stay executed.
 	 */
 	export const Abort: FailureHandlingKind = 'abort';
 
@@ -788,11 +1011,12 @@ export namespace FailureHandlingKind {
 
 
 	/**
-	 * If the workspace edit contains only textual file changes they are executed transactional.
-	 * If resource changes (create, rename or delete file) are part of the change the failure
-	 * handling strategy is abort.
+	 * If the workspace edit contains only textual file changes they are
+	 * executed transactional. If resource changes (create, rename or delete
+	 * file) are part of the change the failure handling strategy is abort.
 	 */
-	export const TextOnlyTransactional: FailureHandlingKind = 'textOnlyTransactional';
+	export const TextOnlyTransactional: FailureHandlingKind
+		= 'textOnlyTransactional';
 
 	/**
 	 * The client tries to undo the operations already executed. But there is no
@@ -834,7 +1058,7 @@ interface TextDocumentItem {
 	 * The version number of this document (it will increase after each
 	 * change, including undo/redo).
 	 */
-	version: number;
+	version: integer;
 
 	/**
 	 * The content of the opened text document.
@@ -906,21 +1130,36 @@ YAML | `yaml`
 
 #### <a href="#versionedTextDocumentIdentifier" name="versionedTextDocumentIdentifier" class="anchor"> VersionedTextDocumentIdentifier </a>
 
-An identifier to denote a specific version of a text document.
+An identifier to denote a specific version of a text document. This information usually flows from the client to the server.
 
 ```typescript
 interface VersionedTextDocumentIdentifier extends TextDocumentIdentifier {
 	/**
-	 * The version number of this document. If a versioned text document identifier
-	 * is sent from the server to the client and the file is not open in the editor
-	 * (the server has not received an open notification before) the server can send
-	 * `null` to indicate that the version is known and the content on disk is the
-	 * master (as speced with document content ownership).
+	 * The version number of this document.
 	 *
-	 * The version number of a document will increase after each change, including
-	 * undo/redo. The number doesn't need to be consecutive.
+	 * The version number of a document will increase after each change,
+	 * including undo/redo. The number doesn't need to be consecutive.
 	 */
-	version: number | null;
+	version: integer;
+}
+```
+
+An identifier which optionally denotes a specific version of a text document. This information usually flows from the server to the client.
+
+```typescript
+interface OptionalVersionedTextDocumentIdentifier extends TextDocumentIdentifier {
+	/**
+	 * The version number of this document. If an optional versioned text document
+	 * identifier is sent from the server to the client and the file is not
+	 * open in the editor (the server has not received an open notification
+	 * before) the server can send `null` to indicate that the version is
+	 * known and the content on disk is the master (as specified with document
+	 * content ownership).
+	 *
+	 * The version number of a document will increase after each change,
+	 * including undo/redo. The number doesn't need to be consecutive.
+	 */
+	version: integer | null;
 }
 ```
 
@@ -928,7 +1167,7 @@ interface VersionedTextDocumentIdentifier extends TextDocumentIdentifier {
 
 Was `TextDocumentPosition` in 1.0 with inlined parameters.
 
-A parameter literal used in requests to pass a text document and a position inside that document.
+A parameter literal used in requests to pass a text document and a position inside that document. It is up to the client to decide how a selection is converted into a position when issuing a request for a text document. The client can for example honor or ignore the selection direction to make LSP request consistent with features implemented internally.
 
 ```typescript
 interface TextDocumentPositionParams {
@@ -971,9 +1210,13 @@ export interface DocumentFilter {
 	 * - `*` to match one or more characters in a path segment
 	 * - `?` to match on one character in a path segment
 	 * - `**` to match any number of path segments, including none
-	 * - `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
-	 * - `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
-	 * - `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+	 * - `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript
+	 *   and JavaScript files)
+	 * - `[]` to declare a range of characters to match in a path segment
+	 *   (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+	 * - `[!...]` to negate a range of characters to match in a path segment
+	 *   (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but
+	 *   not `example.0`)
 	 */
 	pattern?: string;
 }
@@ -1012,8 +1255,8 @@ Options to dynamically register for requests for a set of text documents.
  */
 export interface TextDocumentRegistrationOptions {
 	/**
-	 * A document selector to identify the scope of the registration. If set to null
-	 * the document selector provided on the client side will be used.
+	 * A document selector to identify the scope of the registration. If set to
+	 * null the document selector provided on the client side will be used.
 	 */
 	documentSelector: DocumentSelector | null;
 }
@@ -1021,7 +1264,7 @@ export interface TextDocumentRegistrationOptions {
 
 #### <a href="#markupContent" name="markupContent" class="anchor"> MarkupContent </a>
 
- A `MarkupContent` literal represents a string value which content can be represented in different formats. Currently `plaintext` and `markdown` are supported formats. A `MarkupContent` is usually used in documentation properties of result literals like `CompletionItem` or `SignatureInformation`.
+ A `MarkupContent` literal represents a string value which content can be represented in different formats. Currently `plaintext` and `markdown` are supported formats. A `MarkupContent` is usually used in documentation properties of result literals like `CompletionItem` or `SignatureInformation`. If the format is `markdown` the content should follow the [GitHub Flavored Markdown Specification](https://github.github.com/gfm/).
 
 ```typescript
 /**
@@ -1045,13 +1288,15 @@ export namespace MarkupKind {
 export type MarkupKind = 'plaintext' | 'markdown';
 
 /**
- * A `MarkupContent` literal represents a string value which content is interpreted base on its
- * kind flag. Currently the protocol supports `plaintext` and `markdown` as markup kinds.
+ * A `MarkupContent` literal represents a string value which content is
+ * interpreted base on its kind flag. Currently the protocol supports
+ * `plaintext` and `markdown` as markup kinds.
  *
- * If the kind is `markdown` then the value can contain fenced code blocks like in GitHub issues.
- * See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+ * If the kind is `markdown` then the value can contain fenced code blocks like
+ * in GitHub issues.
  *
- * Here is an example how such a string can be constructed using JavaScript / TypeScript:
+ * Here is an example how such a string can be constructed using
+ * JavaScript / TypeScript:
  * ```typescript
  * let markdown: MarkdownContent = {
  *  kind: MarkupKind.Markdown,
@@ -1065,8 +1310,8 @@ export type MarkupKind = 'plaintext' | 'markdown';
  * };
  * ```
  *
- * *Please Note* that clients might sanitize the return markdown. A client could decide to
- * remove HTML from the markdown to avoid script execution.
+ * *Please Note* that clients might sanitize the return markdown. A client could
+ * decide to remove HTML from the markdown to avoid script execution.
  */
 export interface MarkupContent {
 	/**
@@ -1081,6 +1326,34 @@ export interface MarkupContent {
 }
 ```
 
+In addition clients should signal the markdown parser they are using via the client capability `general.markdown` introduced in version 3.16.0 defined as follows:
+
+ ```typescript
+/**
+ * Client capabilities specific to the used markdown parser.
+ *
+ * @since 3.16.0 - proposed state
+ */
+export interface MarkdownClientCapabilities {
+	/**
+	 * The name of the parser.
+	 */
+	parser: string;
+
+	/**
+	 * The version of the parser.
+	 */
+	version?: string;
+}
+ ```
+
+Known markdown parsers used by clients right now are:
+
+Parser | Version | Documentation
+------ | ------- | -------------
+marked | 1.1.0   | [Marked Documentation](https://marked.js.org/)
+
+
 #### <a href="#workDoneProgress" name="workDoneProgress" class="anchor"> Work Done Progress </a>
 
 > *Since version 3.15.0*
@@ -1106,8 +1379,8 @@ export interface WorkDoneProgressBegin {
 
 	/**
 	 * Controls if a cancel button should show to allow the user to cancel the
-	 * long running operation. Clients that don't support cancellation are allowed
-	 * to ignore the setting.
+	 * long running operation. Clients that don't support cancellation are
+	 * allowed to ignore the setting.
 	 */
 	cancellable?: boolean;
 
@@ -1126,9 +1399,9 @@ export interface WorkDoneProgressBegin {
 	 * to ignore the `percentage` value in subsequent in report notifications.
 	 *
 	 * The value should be steadily rising. Clients are free to ignore values
-	 * that are not following this rule.
+	 * that are not following this rule. The value range is [0, 100]
 	 */
-	percentage?: number;
+	percentage?: uinteger;
 }
 ```
 
@@ -1142,11 +1415,11 @@ export interface WorkDoneProgressReport {
 	kind: 'report';
 
 	/**
-	 * Controls enablement state of a cancel button. This property is only valid if a cancel
-	 * button got requested in the `WorkDoneProgressStart` payload.
+	 * Controls enablement state of a cancel button. This property is only valid
+	 *  if a cancel button got requested in the `WorkDoneProgressStart` payload.
 	 *
-	 * Clients that don't support cancellation or don't support control the button's
-	 * enablement state are allowed to ignore the setting.
+	 * Clients that don't support cancellation or don't support control the
+	 * button's enablement state are allowed to ignore the setting.
 	 */
 	cancellable?: boolean;
 
@@ -1165,9 +1438,9 @@ export interface WorkDoneProgressReport {
 	 * to ignore the `percentage` value in subsequent in report notifications.
 	 *
 	 * The value should be steadily rising. Clients are free to ignore values
-	 * that are not following this rule.
+	 * that are not following this rule. The value range is [0, 100]
 	 */
-	percentage?: number;
+	percentage?: uinteger;
 }
 ```
 
@@ -1192,8 +1465,10 @@ export interface WorkDoneProgressEnd {
 
 Work Done progress can be initiated in two different ways:
 
-1. by the sender of a request (mostly clients) using the predefined `workDoneToken` property in the requests parameter literal.
-1. by a server using the request `window/workDoneProgress/create`.
+1. by the sender of a request (mostly clients) using the predefined `workDoneToken` property in the requests parameter literal. The document will refer to this kind of progress as client initiated progress.
+1. by a server using the request `window/workDoneProgress/create`. The document will refer to this kind of progress as server initiated progress.
+
+###### <a href="#clientInitiatedProgress" name="clientInitiatedProgress" class="anchor">Client Initiated Progress </a>
 
 Consider a client sending a `textDocument/reference` request to a server and the client accepts work done progress reporting on that request. To signal this to the server the client would add a `workDoneToken` property to the reference request parameters. Something like this:
 
@@ -1214,6 +1489,17 @@ Consider a client sending a `textDocument/reference` request to a server and the
 }
 ```
 
+The corresponding type definition for the parameter property looks like this:
+
+```typescript
+export interface WorkDoneProgressParams {
+	/**
+	 * An optional token that a server can use to report work done progress.
+	 */
+	workDoneToken?: ProgressToken;
+}
+```
+
 A server uses the `workDoneToken` to report progress for the specific `textDocument/reference`. For the above request the `$/progress` notification params look like this:
 
 ```json
@@ -1229,25 +1515,11 @@ A server uses the `workDoneToken` to report progress for the specific `textDocum
 }
 ```
 
-Server initiated work done progress works the same. The only difference is that the server requests a progress user interface using the `window/workDoneProgress/create` request providing a token that is afterwards used to report progress.
+The token received via the `workDoneToken` property in a request's param literal is only valid as long as the request has not send a response back.
 
-##### <a href="#signalingWorkDoneProgressReporting" name="signalingWorkDoneProgressReporting" class="anchor"> Signaling Work Done Progress Reporting </a>
+There is no specific client capability signaling whether a client will send a progress token per request. The reason for this is that this is in many clients not a static aspect and might even change for every request instance for the same request type. So the capability is signal on every request instance by the presence of a `workDoneToken` property.
 
-To keep the protocol backwards compatible servers are only allowed to use work done progress reporting if the client signals corresponding support using the client capability `window.workDoneProgress` which is defined as follows:
-
-```typescript
-	/**
-	 * Window specific client capabilities.
-	 */
-	window?: {
-		/**
-		 * Whether client supports handling progress notifications.
-		 */
-		workDoneProgress?: boolean;
-	}
-```
-
-To avoid that clients set up a progress monitor user interface before sending a request but the server doesn't actually report any progress a server needs to signal work done progress reporting in the corresponding server capability. For the above find references example a server would signal such a support by setting the `referencesProvider` property in the server capabilities as follows:
+To avoid that clients set up a progress monitor user interface before sending a request but the server doesn't actually report any progress a server needs to signal general work done progress reporting support in the corresponding server capability. For the above find references example a server would signal such a support by setting the `referencesProvider` property in the server capabilities as follows:
 
 ```json
 {
@@ -1257,27 +1529,30 @@ To avoid that clients set up a progress monitor user interface before sending a
 }
 ```
 
-#### <a href="#workDoneProgressParams" name="workDoneProgressParams" class="anchor"> WorkDoneProgressParams </a>
-
-A parameter literal used to pass a work done progress token.
+The corresponding type definition for the server capability looks like this:
 
 ```typescript
-export interface WorkDoneProgressParams {
-	/**
-	 * An optional token that a server can use to report work done progress.
-	 */
-	workDoneToken?: ProgressToken;
+export interface WorkDoneProgressOptions {
+	workDoneProgress?: boolean;
 }
 ```
+###### <a href="#serverInitiatedProgress" name="serverInitiatedProgress" class="anchor">Server Initiated Progress </a>
 
-#### <a href="#workDoneProgressOptions" name="workDoneProgressOptions" class="anchor"> WorkDoneProgressOptions </a>
+Servers can also initiate progress reporting using the `window/workDoneProgress/create` request. This is useful if the server needs to report progress outside of a request (for example the server needs to re-index a database). The returned token can then be used to report progress using the same notifications used as for client initiated progress. A token obtained using the create request should only be used once (e.g. only one begin, many report and one end notification should be sent to it).
 
-Options to signal work done progress support in server capabilities.
+To keep the protocol backwards compatible servers are only allowed to use `window/workDoneProgress/create` request if the client signals corresponding support using the client capability `window.workDoneProgress` which is defined as follows:
 
 ```typescript
-export interface WorkDoneProgressOptions {
-	workDoneProgress?: boolean;
-}
+	/**
+	 * Window specific client capabilities.
+	 */
+	window?: {
+		/**
+		 * Whether client supports server initiated progress using the
+		 * `window/workDoneProgress/create` request.
+		 */
+		workDoneProgress?: boolean;
+	}
 ```
 
 #### <a href="#partialResults" name="partialResults" class="anchor"> Partial Result Progress </a>
@@ -1321,8 +1596,8 @@ A parameter literal used to pass a partial result token.
 ```typescript
 export interface PartialResultParams {
 	/**
-	 * An optional token that a server can use to report partial results (e.g. streaming) to
-	 * the client.
+	 * An optional token that a server can use to report partial results (e.g.
+	 * streaming) to the client.
 	 */
 	partialResultToken?: ProgressToken;
 }
@@ -1344,9 +1619,9 @@ This section documents the actual language server protocol. It uses the followin
 * a header describing the request
 * an optional _Client capability_ section describing the client capability of the request. This includes the client capabilities property path and JSON structure.
 * an optional _Server Capability_ section describing the server capability of the request. This includes the server capabilities property path and JSON structure. Clients should ignore server capabilities they don't understand (e.g. the initialize request shouldn't fail in this case).
+* an optional _Registration Options_ section describing the registration option if the request or notification supports dynamic capability registration. See the [register](#client_registerCapability) and [unregister](#client_unregisterCapability) request for how this works in detail.
 * a _Request_ section describing the format of the request sent. The method is a string identifying the request the params are documented using a TypeScript interface. It is also documented whether the request supports work done progress and partial result progress.
-* a _Response_ section describing the format of the response. The result item describes the returned data in case of a success. The optional partial result item describes the returned data of a partial result notification. The error.data describes the returned data in case of an error. Please remember that in case of a failure the response already contains an error.code and an error.message field. These fields are only spec'd if the protocol forces the use of certain error codes or messages. In cases where the server can decide on these values freely they aren't listed here.
-* a _Registration Options_ section describing the registration option if the request or notification supports dynamic capability registration.
+* a _Response_ section describing the format of the response. The result item describes the returned data in case of a success. The optional partial result item describes the returned data of a partial result notification. The error.data describes the returned data in case of an error. Please remember that in case of a failure the response already contains an error.code and an error.message field. These fields are only specified if the protocol forces the use of certain error codes or messages. In cases where the server can decide on these values freely they aren't listed here.
 
 #### Request, Notification and Response ordering
 
@@ -1376,11 +1651,12 @@ _Request_:
 ```typescript
 interface InitializeParams extends WorkDoneProgressParams {
 	/**
-	 * The process Id of the parent process that started
-	 * the server. Is null if the process has not been started by another process.
-	 * If the parent process is not alive then the server should exit (see exit notification) its process.
+	 * The process Id of the parent process that started the server. Is null if
+	 * the process has not been started by another process. If the parent
+	 * process is not alive then the server should exit (see exit notification)
+	 * its process.
 	 */
-	processId: number | null;
+	processId: integer | null;
 
 	/**
 	 * Information about the client
@@ -1399,11 +1675,23 @@ interface InitializeParams extends WorkDoneProgressParams {
 		version?: string;
 	};
 
+	/**
+	 * The locale the client is currently showing the user interface
+	 * in. This must not necessarily be the locale of the operating
+	 * system.
+	 *
+	 * Uses IETF language tags as the value's syntax
+	 * (See https://en.wikipedia.org/wiki/IETF_language_tag)
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	locale?: string;
+
 	/**
 	 * The rootPath of the workspace. Is null
 	 * if no folder is open.
 	 *
-	 * @deprecated in favour of rootUri.
+	 * @deprecated in favour of `rootUri`.
 	 */
 	rootPath?: string | null;
 
@@ -1411,6 +1699,8 @@ interface InitializeParams extends WorkDoneProgressParams {
 	 * The rootUri of the workspace. Is null if no
 	 * folder is open. If both `rootPath` and `rootUri` are set
 	 * `rootUri` wins.
+	 *
+	 * @deprecated in favour of `workspaceFolders`
 	 */
 	rootUri: DocumentUri | null;
 
@@ -1443,7 +1733,9 @@ interface InitializeParams extends WorkDoneProgressParams {
 Where `ClientCapabilities` and `TextDocumentClientCapabilities` are defined as follows:
 
 
-##### `TextDocumentClientCapabilities` define capabilities the editor / tool provides on text documents.
+##### TextDocumentClientCapabilities
+
+`TextDocumentClientCapabilities` define capabilities the editor / tool provides on text documents.
 
 ```typescript
 /**
@@ -1553,7 +1845,8 @@ export interface TextDocumentClientCapabilities {
 	rename?: RenameClientCapabilities;
 
 	/**
-	 * Capabilities specific to the `textDocument/publishDiagnostics` notification.
+	 * Capabilities specific to the `textDocument/publishDiagnostics`
+	 * notification.
 	 */
 	publishDiagnostics?: PublishDiagnosticsClientCapabilities;
 
@@ -1572,11 +1865,32 @@ export interface TextDocumentClientCapabilities {
 	selectionRange?: SelectionRangeClientCapabilities;
 
 	/**
-	 * Capabilities specific to the `textDocument/semanticTokens/*` requests.
+	 * Capabilities specific to the `textDocument/linkedEditingRange` request.
+	 *
+	 * @since 3.16.0
+	 */
+	linkedEditingRange?: LinkedEditingRangeClientCapabilities;
+
+	/**
+	 * Capabilities specific to the various call hierarchy requests.
+	 *
+	 * @since 3.16.0
+	 */
+	callHierarchy?: CallHierarchyClientCapabilities;
+
+	/**
+	 * Capabilities specific to the various semantic token requests.
 	 *
 	 * @since 3.16.0
 	 */
 	semanticTokens?: SemanticTokensClientCapabilities;
+
+	/**
+	 * Capabilities specific to the `textDocument/moniker` request.
+	 *
+	 * @since 3.16.0
+	 */
+	moniker?: MonikerClientCapabilities;
 }
 ```
 
@@ -1591,50 +1905,68 @@ interface ClientCapabilities {
 	 */
 	workspace?: {
 		/**
-		* The client supports applying batch edits
-		* to the workspace by supporting the request
-		* 'workspace/applyEdit'
-		*/
+		 * The client supports applying batch edits
+		 * to the workspace by supporting the request
+		 * 'workspace/applyEdit'
+		 */
 		applyEdit?: boolean;
 
 		/**
-		* Capabilities specific to `WorkspaceEdit`s
-		*/
+		 * Capabilities specific to `WorkspaceEdit`s
+		 */
 		workspaceEdit?: WorkspaceEditClientCapabilities;
 
 		/**
-		* Capabilities specific to the `workspace/didChangeConfiguration` notification.
-		*/
+		 * Capabilities specific to the `workspace/didChangeConfiguration`
+		 * notification.
+		 */
 		didChangeConfiguration?: DidChangeConfigurationClientCapabilities;
 
 		/**
-		* Capabilities specific to the `workspace/didChangeWatchedFiles` notification.
-		*/
+		 * Capabilities specific to the `workspace/didChangeWatchedFiles`
+		 * notification.
+		 */
 		didChangeWatchedFiles?: DidChangeWatchedFilesClientCapabilities;
 
 		/**
-		* Capabilities specific to the `workspace/symbol` request.
-		*/
+		 * Capabilities specific to the `workspace/symbol` request.
+		 */
 		symbol?: WorkspaceSymbolClientCapabilities;
 
 		/**
-		* Capabilities specific to the `workspace/executeCommand` request.
-		*/
+		 * Capabilities specific to the `workspace/executeCommand` request.
+		 */
 		executeCommand?: ExecuteCommandClientCapabilities;
 
 		/**
-		* The client has support for workspace folders.
-		*
-		* Since 3.6.0
-		*/
+		 * The client has support for workspace folders.
+		 *
+		 * @since 3.6.0
+		 */
 		workspaceFolders?: boolean;
 
 		/**
-		* The client supports `workspace/configuration` requests.
-		*
-		* Since 3.6.0
-		*/
+		 * The client supports `workspace/configuration` requests.
+		 *
+		 * @since 3.6.0
+		 */
 		configuration?: boolean;
+
+		/**
+		 * Capabilities specific to the semantic token requests scoped to the
+		 * workspace.
+		 *
+		 * @since 3.16.0 - proposed state
+		 */
+		 semanticTokens?: SemanticTokensWorkspaceClientCapabilities;
+
+		/**
+		 * Capabilities specific to the code lens requests scoped to the
+		 * workspace.
+		 *
+		 * @since 3.16.0 - proposed state
+		 */
+		codeLens?: CodeLensWorkspaceClientCapabilities;
 	};
 
 	/**
@@ -1647,12 +1979,48 @@ interface ClientCapabilities {
 	 */
 	window?: {
 		/**
-		 * Whether client supports handling progress notifications. If set servers are allowed to
-		 * report in `workDoneProgress` property in the request specific server capabilities.
+		 * Whether client supports handling progress notifications. If set
+		 * servers are allowed to report in `workDoneProgress` property in the
+		 * request specific server capabilities.
 		 *
-		 * Since 3.15.0
+		 * @since 3.15.0
 		 */
 		workDoneProgress?: boolean;
+
+		/**
+		 * Capabilities specific to the showMessage request
+		 *
+		 * @since 3.16.0 - proposed state
+		 */
+		showMessage?: ShowMessageRequestClientCapabilities;
+
+		/**
+		 * Client capabilities for the show document request.
+		 *
+		 * @since 3.16.0 - proposed state
+		 */
+		showDocument?: ShowDocumentClientCapabilities;
+	}
+
+	/**
+	 * General client capabilities.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	general?: {
+		/**
+		 * Client capabilities specific to regular expressions.
+		 *
+		 * @since 3.16.0 - proposed state
+		 */
+		regularExpressions?: RegularExpressionsClientCapabilities;
+
+		/**
+		 * Client capabilities specific to the client's markdown parser.
+		 *
+		 * @since 3.16.0 - proposed state
+		 */
+		markdown?: MarkdownClientCapabilities;
 	}
 
 	/**
@@ -1698,11 +2066,13 @@ interface InitializeResult {
  */
 export namespace InitializeError {
 	/**
-	 * If the protocol version provided by the client can't be handled by the server.
-	 * @deprecated This initialize error got replaced by client capabilities. There is
-	 * no version handshake in version 3.0x
+	 * If the protocol version provided by the client can't be handled by the
+	 * server.
+	 *
+	 * @deprecated This initialize error got replaced by client capabilities.
+	 * There is no version handshake in version 3.0x
 	 */
-	export const unknownProtocolVersion: number = 1;
+	export const unknownProtocolVersion: 1 = 1;
 }
 ```
 
@@ -1725,10 +2095,12 @@ The server can signal the following capabilities:
 ```typescript
 interface ServerCapabilities {
 	/**
-	 * Defines how text documents are synced. Is either a detailed structure defining each notification or
-	 * for backwards compatibility the TextDocumentSyncKind number. If omitted it defaults to `TextDocumentSyncKind.None`.
+	 * Defines how text documents are synced. Is either a detailed structure
+	 * defining each notification or for backwards compatibility the
+	 * TextDocumentSyncKind number. If omitted it defaults to
+	 * `TextDocumentSyncKind.None`.
 	 */
-	textDocumentSync?: TextDocumentSyncOptions | number;
+	textDocumentSync?: TextDocumentSyncOptions | TextDocumentSyncKind;
 
 	/**
 	 * The server provides completion support.
@@ -1750,7 +2122,8 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.14.0
 	 */
-	declarationProvider?: boolean | DeclarationOptions | DeclarationRegistrationOptions;
+	declarationProvider?: boolean | DeclarationOptions
+		| DeclarationRegistrationOptions;
 
 	/**
 	 * The server provides goto definition support.
@@ -1762,14 +2135,16 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.6.0
 	 */
-	typeDefinitionProvider?: boolean | TypeDefinitionOptions | TypeDefinitionRegistrationOptions;
+	typeDefinitionProvider?: boolean | TypeDefinitionOptions
+		| TypeDefinitionRegistrationOptions;
 
 	/**
 	 * The server provides goto implementation support.
 	 *
 	 * @since 3.6.0
 	 */
-	implementationProvider?: boolean | ImplementationOptions | ImplementationRegistrationOptions;
+	implementationProvider?: boolean | ImplementationOptions
+		| ImplementationRegistrationOptions;
 
 	/**
 	 * The server provides find references support.
@@ -1787,9 +2162,9 @@ interface ServerCapabilities {
 	documentSymbolProvider?: boolean | DocumentSymbolOptions;
 
 	/**
-	 * The server provides code actions. The `CodeActionOptions` return type is only
-	 * valid if the client signals code action literal support via the property
-	 * `textDocument.codeAction.codeActionLiteralSupport`.
+	 * The server provides code actions. The `CodeActionOptions` return type is
+	 * only valid if the client signals code action literal support via the
+	 * property `textDocument.codeAction.codeActionLiteralSupport`.
 	 */
 	codeActionProvider?: boolean | CodeActionOptions;
 
@@ -1808,7 +2183,8 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.6.0
 	 */
-	colorProvider?: boolean | DocumentColorOptions | DocumentColorRegistrationOptions;
+	colorProvider?: boolean | DocumentColorOptions
+		| DocumentColorRegistrationOptions;
 
 	/**
 	 * The server provides document formatting.
@@ -1837,7 +2213,8 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.10.0
 	 */
-	foldingRangeProvider?: boolean | FoldingRangeOptions | FoldingRangeRegistrationOptions;
+	foldingRangeProvider?: boolean | FoldingRangeOptions
+		| FoldingRangeRegistrationOptions;
 
 	/**
 	 * The server provides execute command support.
@@ -1849,19 +2226,44 @@ interface ServerCapabilities {
 	 *
 	 * @since 3.15.0
 	 */
-	selectionRangeProvider?: boolean | SelectionRangeOptions | SelectionRangeRegistrationOptions;
+	selectionRangeProvider?: boolean | SelectionRangeOptions
+		| SelectionRangeRegistrationOptions;
+
+	/**
+	 * The server provides linked editing range support.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	linkedEditingRangeProvider?: boolean | LinkedEditingRangeOptions
+		| LinkedEditingRangeRegistrationOptions;
+
+	/**
+	 * The server provides call hierarchy support.
+	 *
+	 * @since 3.16.0
+	 */
+	callHierarchyProvider?: boolean | CallHierarchyOptions
+		| CallHierarchyRegistrationOptions;
 
 	/**
 	 * The server provides semantic tokens support.
 	 *
 	 * @since 3.16.0
 	 */
-	semanticTokensProvider?: SemanticTokensOptions | SemanticTokensRegistrationOptions;
+	semanticTokensProvider?: SemanticTokensOptions
+		| SemanticTokensRegistrationOptions;
+
+	/**
+	 * Whether server provides moniker support.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+    monikerProvider?: boolean | MonikerOptions | MonikerRegistrationOptions;
 
 	/**
 	 * The server provides workspace symbol support.
 	 */
-	workspaceSymbolProvider?: boolean;
+	workspaceSymbolProvider?: boolean | WorkspaceSymbolOptions;
 
 	/**
 	 * Workspace specific server capabilities
@@ -1921,23 +2323,24 @@ _Notification_:
 A notification to log the trace of the server's execution.
 The amount and content of these notifications depends on the current `trace` configuration.
 If `trace` is `'off'`, the server should not send any `logTrace` notification.
-If `trace` is `'message'`, the server should not add the `'verbose'` field in the `logTraceParams`.
+If `trace` is `'message'`, the server should not add the `'verbose'` field in the `LogTraceParams`.
 
 `$/logTrace` should be used for systematic trace reporting. For single debugging messages, the server should send [`window/logMessage`](#window_logMessage) notifications.
 
 
 _Notification_:
 * method: '$/logTrace'
-* params: `logTraceParams` defined as follows:
+* params: `LogTraceParams` defined as follows:
 
 ```typescript
-interface logTraceParams {
+interface LogTraceParams {
 	/**
 	 * The message to be logged.
 	 */
 	message: string;
 	/**
-	 * Additional information that can be computed if the `trace` configuration is set to `'verbose'`
+	 * Additional information that can be computed if the `trace` configuration
+	 * is set to `'verbose'`
 	 */
 	verbose?: string;
 }
@@ -1949,10 +2352,10 @@ A notification that should be used by the client to modify the trace setting of
 
 _Notification_:
 * method: '$/setTrace'
-* params: `setTraceParams` defined as follows:
+* params: `SetTraceParams` defined as follows:
 
 ```typescript
-interface setTraceParams {
+interface SetTraceParams {
 	/**
 	 * The new value that should be assigned to the trace setting.
 	 */
@@ -1973,7 +2376,7 @@ interface ShowMessageParams {
 	/**
 	 * The message type. See {@link MessageType}.
 	 */
-	type: number;
+	type: MessageType;
 
 	/**
 	 * The actual message.
@@ -2003,49 +2406,159 @@ export namespace MessageType {
 	 */
 	export const Log = 4;
 }
+
+export type MessageType = 1 | 2 | 3 | 4;
+```
+
+#### <a href="#window_showMessageRequest" name="window_showMessageRequest" class="anchor">ShowMessage Request (:arrow_right_hook:)</a>
+
+The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
+
+_Client Capability_:
+* property path (optional): `window.showMessage`
+* property type: `ShowMessageRequestClientCapabilities` defined as follows:
+
+```typescript
+/**
+ * Show message request client capabilities
+ */
+export interface ShowMessageRequestClientCapabilities {
+	/**
+	 * Capabilities specific to the `MessageActionItem` type.
+	 */
+	messageActionItem?: {
+		/**
+		 * Whether the client supports additional attributes which
+		 * are preserved and sent back to the server in the
+		 * request's response.
+		 */
+		additionalPropertiesSupport?: boolean;
+	}
+}
+```
+
+_Request_:
+* method: 'window/showMessageRequest'
+* params: `ShowMessageRequestParams` defined as follows:
+
+_Response_:
+* result: the selected `MessageActionItem` \| `null` if none got selected.
+* error: code and message set in case an exception happens during showing a message.
+
+```typescript
+interface ShowMessageRequestParams {
+	/**
+	 * The message type. See {@link MessageType}
+	 */
+	type: MessageType;
+
+	/**
+	 * The actual message
+	 */
+	message: string;
+
+	/**
+	 * The message action items to present.
+	 */
+	actions?: MessageActionItem[];
+}
+```
+
+Where the `MessageActionItem` is defined as follows:
+
+```typescript
+interface MessageActionItem {
+	/**
+	 * A short title like 'Retry', 'Open Log' etc.
+	 */
+	title: string;
+}
 ```
 
-#### <a href="#window_showMessageRequest" name="window_showMessageRequest" class="anchor">ShowMessage Request (:arrow_right_hook:)</a>
+#### <a href="#window_showDocument" name="window_showDocument" class="anchor">Show Document Request (:arrow_right_hook:)</a>
 
-The show message request is sent from a server to a client to ask the client to display a particular message in the user interface. In addition to the show message notification the request allows to pass actions and to wait for an answer from the client.
+> New in version 3.16.0
 
-_Request_:
-* method: 'window/showMessageRequest'
-* params: `ShowMessageRequestParams` defined as follows:
+The show document request is sent from a server to a client to ask the client to display a particular document in the user interface.
 
-_Response_:
-* result: the selected `MessageActionItem` \| `null` if none got selected.
-* error: code and message set in case an exception happens during showing a message.
+_Client Capability_:
+* property path (optional): `window.showDocument`
+* property type: `ShowDocumentClientCapabilities` defined as follows:
 
 ```typescript
-interface ShowMessageRequestParams {
+/**
+ * Client capabilities for the show document request.
+ *
+ * @since 3.16.0 - proposed state
+ */
+export interface ShowDocumentClientCapabilities {
 	/**
-	 * The message type. See {@link MessageType}
+	 * The client has support for the show document
+	 * request.
+	 */
+	support: boolean;
+}
+```
+
+_Request_:
+* method: 'window/showDocument'
+* params: `ShowDocumentParams` defined as follows:
+
+```typescript
+/**
+ * Params to show a document.
+ *
+ * @since 3.16.0 - proposed state
+ */
+export interface ShowDocumentParams {
+	/**
+	 * The document uri to show.
 	 */
-	type: number;
+	uri: URI;
 
 	/**
-	 * The actual message
+	 * Indicates to show the resource in an external program.
+	 * To show for example `https://code.visualstudio.com/`
+	 * in the default WEB browser set `external` to `true`.
 	 */
-	message: string;
+	external?: boolean;
 
 	/**
-	 * The message action items to present.
+	 * An optional property to indicate whether the editor
+	 * showing the document should take focus or not.
+	 * Clients might ignore this property if an external
+	 * program is started.
 	 */
-	actions?: MessageActionItem[];
+	takeFocus?: boolean;
+
+	/**
+	 * An optional selection range if the document is a text
+	 * document. Clients might ignore the property if an
+	 * external program is started or the file is not a text
+	 * file.
+	 */
+	selection?: Range;
 }
 ```
 
-Where the `MessageActionItem` is defined as follows:
+_Response_:
+
+* result: `ShowDocumentResult` defined as follows:
 
 ```typescript
-interface MessageActionItem {
+/**
+ * The result of an show document request.
+ *
+ * @since 3.16.0 - proposed state
+ */
+export interface ShowDocumentResult {
 	/**
-	 * A short title like 'Retry', 'Open Log' etc.
+	 * A boolean indicating if the show was successful.
 	 */
-	title: string;
+	success: boolean;
 }
 ```
+* error: code and message set in case an exception happens during showing a document.
 
 #### <a href="#window_logMessage" name="window_logMessage" class="anchor">LogMessage Notification (:arrow_left:)</a>
 
@@ -2060,7 +2573,7 @@ interface LogMessageParams {
 	/**
 	 * The message type. See {@link MessageType}
 	 */
-	type: number;
+	type: MessageType;
 
 	/**
 	 * The actual message
@@ -2112,11 +2625,11 @@ export interface WorkDoneProgressCancelParams {
 
 #### <a href="#telemetry_event" name="telemetry_event" class="anchor">Telemetry Notification (:arrow_left:)</a>
 
-The telemetry notification is sent from the server to the client to ask the client to log a telemetry event.
+The telemetry notification is sent from the server to the client to ask the client to log a telemetry event. The protocol doesn't specify the payload since no interpretation of the data happens in the protocol. Most clients even don't handle the event directly but forward them to the extensions owing the corresponding server issuing the event.
 
 _Notification_:
 * method: 'telemetry/event'
-* params: 'any'
+* params: 'object' \| 'number' \| 'boolean' \| 'string';
 
 #### <a href="#client_registerCapability" name="client_registerCapability" class="anchor">Register Capability (:arrow_right_hook:)</a>
 
@@ -2409,13 +2922,13 @@ _Response_:
 
 #### <a href="#workspace_didChangeWatchedFiles" name="workspace_didChangeWatchedFiles" class="anchor">DidChangeWatchedFiles Notification (:arrow_right:)</a>
 
-The watched files notification is sent from the client to the server when the client detects changes to files watched by the language client. It is recommended that servers register for these file events using the registration mechanism. In former implementations clients pushed file events without the server actively asking for it.
+The watched files notification is sent from the client to the server when the client detects changes to files and folders watched by the language client (note although the name suggest that only file events are sent it is about file system events which include folders as well). It is recommended that servers register for these file system events using the registration mechanism. In former implementations clients pushed file events without the server actively asking for it.
 
-Servers are allowed to run their own file watching mechanism and not rely on clients to provide file events. However this is not recommended due to the following reasons:
+Servers are allowed to run their own file system watching mechanism and not rely on clients to provide file system events. However this is not recommended due to the following reasons:
 
-- to our experience getting file watching on disk right is challenging, especially if it needs to be supported across multiple OSes.
-- file watching is not for free especially if the implementation uses some sort of polling and keeps a file tree in memory to compare time stamps (as for example some node modules do)
-- a client usually starts more than one server. If every server runs its own file watching it can become a CPU or memory problem.
+- to our experience getting file system watching on disk right is challenging, especially if it needs to be supported across multiple OSes.
+- file system watching is not for free especially if the implementation uses some sort of polling and keeps a file system tree in memory to compare time stamps (as for example some node modules do)
+- a client usually starts more than one server. If every server runs its own file system watching it can become a CPU or memory problem.
 - in general there are more server than client implementations. So this problem is better solved on the client side.
 
 _Client Capability_:
@@ -2425,9 +2938,9 @@ _Client Capability_:
 ```typescript
 export interface DidChangeWatchedFilesClientCapabilities {
 	/**
-	 * Did change watched files notification supports dynamic registration. Please note
-	 * that the current protocol doesn't support static configuration for file changes
-	 * from the server side.
+	 * Did change watched files notification supports dynamic registration.
+	 * Please note that the current protocol doesn't support static
+	 * configuration for file changes from the server side.
 	 */
 	dynamicRegistration?: boolean;
 }
@@ -2453,9 +2966,13 @@ export interface FileSystemWatcher {
 	 * - `*` to match one or more characters in a path segment
 	 * - `?` to match on one character in a path segment
 	 * - `**` to match any number of path segments, including none
-	 * - `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
-	 * - `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
-	 * - `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+	 * - `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript
+	 *   and JavaScript files)
+	 * - `[]` to declare a range of characters to match in a path segment
+	 *   (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+	 * - `[!...]` to negate a range of characters to match in a path segment
+	 *   (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not
+	 *   `example.0`)
 	 */
 	globPattern: string;
 
@@ -2464,7 +2981,7 @@ export interface FileSystemWatcher {
 	 * to WatchKind.Create | WatchKind.Change | WatchKind.Delete
 	 * which is 7.
 	 */
-	kind?: number;
+	kind?: uinteger;
 }
 
 export namespace WatchKind {
@@ -2512,7 +3029,7 @@ interface FileEvent {
 	/**
 	 * The change type.
 	 */
-	type: number;
+	type: uinteger;
 }
 
 /**
@@ -2550,7 +3067,8 @@ interface WorkspaceSymbolClientCapabilities {
 	dynamicRegistration?: boolean;
 
 	/**
-	 * Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
+	 * Specific capabilities for the `SymbolKind` in the `workspace/symbol`
+	 * request.
 	 */
 	symbolKind?: {
 		/**
@@ -2592,7 +3110,8 @@ export interface WorkspaceSymbolOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `WorkspaceSymbolRegistrationOptions` defined as follows:
 ```typescript
-export interface WorkspaceSymbolRegistrationOptions extends WorkspaceSymbolOptions {
+export interface WorkspaceSymbolRegistrationOptions
+	extends WorkspaceSymbolOptions {
 }
 ```
 
@@ -2604,7 +3123,8 @@ _Request_:
 /**
  * The parameters of a Workspace Symbol Request.
  */
-interface WorkspaceSymbolParams extends WorkDoneProgressParams, PartialResultParams {
+interface WorkspaceSymbolParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * A query string to filter symbols by. Clients may send an empty
 	 * string here to request all symbols.
@@ -2620,9 +3140,7 @@ _Response_:
 
 #### <a href="#workspace_executeCommand" name="workspace_executeCommand" class="anchor">Execute a command (:leftwards_arrow_with_hook:)</a>
 
-The `workspace/executeCommand` request is sent from the client to the server to trigger command execution on the server. In most cases
-the server creates a `WorkspaceEdit` structure and applies the changes to the workspace using the request `workspace/applyEdit` which is
-sent from the server to the client.
+The `workspace/executeCommand` request is sent from the client to the server to trigger command execution on the server. In most cases the server creates a `WorkspaceEdit` structure and applies the changes to the workspace using the request `workspace/applyEdit` which is sent from the server to the client.
 
 _Client Capability_:
 * property path (optional): `workspace.executeCommand`
@@ -2655,7 +3173,8 @@ _Registration Options_: `ExecuteCommandRegistrationOptions` defined as follows:
 /**
  * Execute command registration options.
  */
-export interface ExecuteCommandRegistrationOptions extends ExecuteCommandOptions {
+export interface ExecuteCommandRegistrationOptions
+	extends ExecuteCommandOptions {
 }
 ```
 
@@ -2725,11 +3244,18 @@ export interface ApplyWorkspaceEditResponse {
 
 	/**
 	 * An optional textual description for why the edit was not applied.
-	 * This may be used may be used by the server for diagnostic
-	 * logging or to provide a suitable error for a request that
-	 * triggered the edit.
+	 * This may be used by the server for diagnostic logging or to provide
+	 * a suitable error for a request that triggered the edit.
 	 */
 	failureReason?: string;
+
+	/**
+	 * Depending on the client's failure handling strategy `failedChange`
+	 * might contain the index of the change that failed. This property is
+	 * only available if the client signals a `failureHandlingStrategy`
+	 * in its client capabilities.
+	 */
+	failedChange?: uinteger;
 }
 ```
 * error: code and message set in case an exception happens during the request.
@@ -2750,7 +3276,8 @@ Controls whether text document synchronization supports dynamic registration.
 
 ```typescript
 /**
- * Defines how the host (editor) should sync document changes to the language server.
+ * Defines how the host (editor) should sync document changes to the language
+ * server.
  */
 export namespace TextDocumentSyncKind {
 	/**
@@ -2774,14 +3301,16 @@ export namespace TextDocumentSyncKind {
 
 export interface TextDocumentSyncOptions {
 	/**
-	 * Open and close notifications are sent to the server. If omitted open close notification should not
-	 * be sent.
+	 * Open and close notifications are sent to the server. If omitted open
+	 * close notification should not be sent.
 	 */
 	openClose?: boolean;
 
 	/**
-	 * Change notifications are sent to the server. See TextDocumentSyncKind.None, TextDocumentSyncKind.Full
-	 * and TextDocumentSyncKind.Incremental. If omitted it defaults to TextDocumentSyncKind.None.
+	 * Change notifications are sent to the server. See
+	 * TextDocumentSyncKind.None, TextDocumentSyncKind.Full and
+	 * TextDocumentSyncKind.Incremental. If omitted it defaults to
+	 * TextDocumentSyncKind.None.
 	 */
 	change?: TextDocumentSyncKind;
 }
@@ -2829,7 +3358,8 @@ _Registration Options_: `TextDocumentChangeRegistrationOptions` defined as follo
 /**
  * Describe options to be used when registering for text document change events.
  */
-export interface TextDocumentChangeRegistrationOptions extends TextDocumentRegistrationOptions {
+export interface TextDocumentChangeRegistrationOptions
+	extends TextDocumentRegistrationOptions {
 	/**
 	 * How documents are synced to the server. See TextDocumentSyncKind.Full
 	 * and TextDocumentSyncKind.Incremental.
@@ -2852,24 +3382,26 @@ interface DidChangeTextDocumentParams {
 	textDocument: VersionedTextDocumentIdentifier;
 
 	/**
-	 * The actual content changes. The content changes describe single state changes
-	 * to the document. So if there are two content changes c1 (at array index 0) and
-	 * c2 (at array index 1) for a document in state S then c1 moves the document from
-	 * S to S' and c2 from S' to S''. So c1 is computed on the state S and c2 is computed
-	 * on the state S'.
+	 * The actual content changes. The content changes describe single state
+	 * changes to the document. So if there are two content changes c1 (at
+	 * array index 0) and c2 (at array index 1) for a document in state S then
+	 * c1 moves the document from S to S' and c2 from S' to S''. So c1 is
+	 * computed on the state S and c2 is computed on the state S'.
 	 *
-	 * To mirror the content of a document using change events use the following approach:
+	 * To mirror the content of a document using change events use the following
+	 * approach:
 	 * - start with the same initial content
-	 * - apply the 'textDocument/didChange' notifications in the order you receive them.
-	 * - apply the `TextDocumentContentChangeEvent`s in a single notification in the order
-	 *   you receive them.
+	 * - apply the 'textDocument/didChange' notifications in the order you
+	 *   receive them.
+	 * - apply the `TextDocumentContentChangeEvent`s in a single notification
+	 *   in the order you receive them.
 	 */
 	contentChanges: TextDocumentContentChangeEvent[];
 }
 
 /**
- * An event describing a change to a text document. If range and rangeLength are omitted
- * the new text is considered to be the full content of the document.
+ * An event describing a change to a text document. If range and rangeLength are
+ * omitted the new text is considered to be the full content of the document.
  */
 export type TextDocumentContentChangeEvent = {
 	/**
@@ -2882,7 +3414,7 @@ export type TextDocumentContentChangeEvent = {
 	 *
 	 * @deprecated use range instead.
 	 */
-	rangeLength?: number;
+	rangeLength?: uinteger;
 
 	/**
 	 * The new text for the provided range.
@@ -2931,7 +3463,7 @@ export interface WillSaveTextDocumentParams {
 	/**
 	 * The 'TextDocumentSaveReason'.
 	 */
-	reason: number;
+	reason: TextDocumentSaveReason;
 }
 
 /**
@@ -2940,8 +3472,8 @@ export interface WillSaveTextDocumentParams {
 export namespace TextDocumentSaveReason {
 
 	/**
-	 * Manually triggered, e.g. by the user pressing save, by starting debugging,
-	 * or by an API call.
+	 * Manually triggered, e.g. by the user pressing save, by starting
+	 * debugging, or by an API call.
 	 */
 	export const Manual = 1;
 
@@ -2955,6 +3487,8 @@ export namespace TextDocumentSaveReason {
 	 */
 	export const FocusOut = 3;
 }
+
+export type TextDocumentSaveReason = 1 | 2 | 3;
 ```
 
 #### <a href="#textDocument_willSaveWaitUntil" name="textDocument_willSaveWaitUntil" class="anchor">WillSaveWaitUntilTextDocument Request (:leftwards_arrow_with_hook:)</a>
@@ -3010,7 +3544,8 @@ The capability indicates that the server is interested in `textDocument/didSave`
 
 _Registration Options_: `TextDocumentSaveRegistrationOptions` defined as follows:
 ```typescript
-export interface TextDocumentSaveRegistrationOptions extends TextDocumentRegistrationOptions {
+export interface TextDocumentSaveRegistrationOptions
+	extends TextDocumentRegistrationOptions {
 	/**
 	 * The client is supposed to include the content on save.
 	 */
@@ -3090,7 +3625,8 @@ export interface TextDocumentSyncClientCapabilities {
 }
 
 /**
- * Defines how the host (editor) should sync document changes to the language server.
+ * Defines how the host (editor) should sync document changes to the language
+ * server.
  */
 export namespace TextDocumentSyncKind {
 	/**
@@ -3112,30 +3648,34 @@ export namespace TextDocumentSyncKind {
 	export const Incremental = 2;
 }
 
+export type TextDocumentSyncKind = 0 | 1 | 2;
+
 export interface TextDocumentSyncOptions {
 	/**
-	 * Open and close notifications are sent to the server. If omitted open close notification should not
-	 * be sent.
+	 * Open and close notifications are sent to the server. If omitted open
+	 * close notification should not be sent.
 	 */
 	openClose?: boolean;
 	/**
-	 * Change notifications are sent to the server. See TextDocumentSyncKind.None, TextDocumentSyncKind.Full
-	 * and TextDocumentSyncKind.Incremental. If omitted it defaults to TextDocumentSyncKind.None.
+	 * Change notifications are sent to the server. See
+	 * TextDocumentSyncKind.None, TextDocumentSyncKind.Full and
+	 * TextDocumentSyncKind.Incremental. If omitted it defaults to
+	 * TextDocumentSyncKind.None.
 	 */
-	change?: number;
+	change?: TextDocumentSyncKind;
 	/**
-	 * If present will save notifications are sent to the server. If omitted the notification should not be
-	 * sent.
+	 * If present will save notifications are sent to the server. If omitted
+	 * the notification should not be sent.
 	 */
 	willSave?: boolean;
 	/**
-	 * If present will save wait until requests are sent to the server. If omitted the request should not be
-	 * sent.
+	 * If present will save wait until requests are sent to the server. If
+	 * omitted the request should not be sent.
 	 */
 	willSaveWaitUntil?: boolean;
 	/**
-	 * If present save notifications are sent to the server. If omitted the notification should not be
-	 * sent.
+	 * If present save notifications are sent to the server. If omitted the
+	 * notification should not be sent.
 	 */
 	save?: boolean | SaveOptions;
 }
@@ -3147,7 +3687,7 @@ Diagnostics notification are sent from the server to the client to signal result
 
 Diagnostics are "owned" by the server so it is the server's responsibility to clear them if necessary. The following rule is used for VS Code servers that generate diagnostics:
 
-* if a language is single file only (for example HTML) then diagnostics are cleared by the server when the file is closed.
+* if a language is single file only (for example HTML) then diagnostics are cleared by the server when the file is closed. Please note that open / close events don't necessarily reflect what the user sees in the user interface. These events are ownership events. So with the current version of the specification it is possible that problems are not cleared although the file is not visible in the user interface since the client has not closed the file yet.
 * if a language has a project system (for example C#) diagnostics are not cleared when a file closes. When a project is opened all diagnostics for all files are recomputed (or read from a cache).
 
 When a file changes it is the server's responsibility to re-compute diagnostics and push them to the client. If the computed set is empty it has to push the empty array to clear former diagnostics. Newly pushed diagnostics always replace previously pushed diagnostics. There is no merging that happens on the client side.
@@ -3185,6 +3725,22 @@ export interface PublishDiagnosticsClientCapabilities {
 	 * @since 3.15.0
 	 */
 	versionSupport?: boolean;
+
+	/**
+	 * Client supports a codeDescription property
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	codeDescriptionSupport?: boolean;
+
+	/**
+	 * Whether code action supports the `data` property which is
+	 * preserved between a `textDocument/publishDiagnostics` and
+	 * `textDocument/codeAction` request.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	dataSupport?: boolean;
 }
 ```
 
@@ -3200,11 +3756,12 @@ interface PublishDiagnosticsParams {
 	uri: DocumentUri;
 
 	/**
-	 * Optional the version number of the document the diagnostics are published for.
+	 * Optional the version number of the document the diagnostics are published
+	 * for.
 	 *
 	 * @since 3.15.0
 	 */
-	version?: number;
+	version?: uinteger;
 
 	/**
 	 * An array of diagnostic information items.
@@ -3239,8 +3796,8 @@ export interface CompletionClientCapabilities {
 		 *
 		 * A snippet can define tab stops and placeholders with `$1`, `$2`
 		 * and `${3:foo}`. `$0` defines the final tab stop, it defaults to
-		 * the end of the snippet. Placeholders with equal identifiers are linked,
-		 * that is typing in one will update others too.
+		 * the end of the snippet. Placeholders with equal identifiers are
+		 * linked, that is typing in one will update others too.
 		 */
 		snippetSupport?: boolean;
 
@@ -3266,10 +3823,10 @@ export interface CompletionClientCapabilities {
 		preselectSupport?: boolean;
 
 		/**
-		 * Client supports the tag property on a completion item. Clients supporting
-		 * tags have to handle unknown tags gracefully. Clients especially need to
-		 * preserve unknown tags when sending a completion item back to the server in
-		 * a resolve call.
+		 * Client supports the tag property on a completion item. Clients
+		 * supporting tags have to handle unknown tags gracefully. Clients
+		 * especially need to preserve unknown tags when sending a completion
+		 * item back to the server in a resolve call.
 		 *
 		 * @since 3.15.0
 		 */
@@ -3281,17 +3838,17 @@ export interface CompletionClientCapabilities {
 		}
 
 		/**
-		 * Client support insert replace edit to control different behavior if a
-		 * completion item is inserted in the text or should replace text.
+		 * Client supports insert replace edit to control different behavior if
+		 * a completion item is inserted in the text or should replace text.
 		 *
 		 * @since 3.16.0 - proposed state
 		 */
 		insertReplaceSupport?: boolean;
 
 		/**
-		 * Indicates which properties a client can resolve lazily on a completion
-		 * item. Before version 3.16.0 only the predefined properties `documentation`
-		 * and `details` could be resolved lazily.
+		 * Indicates which properties a client can resolve lazily on a
+		 * completion item. Before version 3.16.0 only the predefined properties
+		 * `documentation` and `details` could be resolved lazily.
 		 *
 		 * @since 3.16.0 - proposed state
 		 */
@@ -3301,6 +3858,17 @@ export interface CompletionClientCapabilities {
 			 */
 			properties: string[];
 		};
+
+		/**
+		 * The client supports the `insertTextMode` property on
+		 * a completion item to override the whitespace handling mode
+		 * as defined by the client (see `insertTextMode`).
+		 *
+		 * @since 3.16.0 - proposed state
+		 */
+		insertTextModeSupport?: {
+			valueSet: InsertTextMode[];
+		}
 	};
 
 	completionItemKind?: {
@@ -3335,24 +3903,27 @@ _Server Capability_:
  */
 export interface CompletionOptions extends WorkDoneProgressOptions {
 	/**
-	 * Most tools trigger completion request automatically without explicitly requesting
-	 * it using a keyboard shortcut (e.g. Ctrl+Space). Typically they do so when the user
-	 * starts to type an identifier. For example if the user types `c` in a JavaScript file
-	 * code complete will automatically pop up present `console` besides others as a
-	 * completion item. Characters that make up identifiers don't need to be listed here.
+	 * Most tools trigger completion request automatically without explicitly
+	 * requesting it using a keyboard shortcut (e.g. Ctrl+Space). Typically they
+	 * do so when the user starts to type an identifier. For example if the user
+	 * types `c` in a JavaScript file code complete will automatically pop up
+	 * present `console` besides others as a completion item. Characters that
+	 * make up identifiers don't need to be listed here.
 	 *
-	 * If code complete should automatically be trigger on characters not being valid inside
-	 * an identifier (for example `.` in JavaScript) list them in `triggerCharacters`.
+	 * If code complete should automatically be trigger on characters not being
+	 * valid inside an identifier (for example `.` in JavaScript) list them in
+	 * `triggerCharacters`.
 	 */
 	triggerCharacters?: string[];
 
 	/**
-	 * The list of all possible characters that commit a completion. This field can be used
-	 * if clients don't support individual commit characters per completion item. See
-	 * `ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`.
+	 * The list of all possible characters that commit a completion. This field
+	 * can be used if clients don't support individual commit characters per
+	 * completion item. See client capability
+	 * `completion.completionItem.commitCharactersSupport`.
 	 *
-	 * If a server provides both `allCommitCharacters` and commit characters on an individual
-	 * completion item the ones on the completion item win.
+	 * If a server provides both `allCommitCharacters` and commit characters on
+	 * an individual completion item the ones on the completion item win.
 	 *
 	 * @since 3.2.0
 	 */
@@ -3368,7 +3939,8 @@ export interface CompletionOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `CompletionRegistrationOptions` options defined as follows:
 ```typescript
-export interface CompletionRegistrationOptions extends TextDocumentRegistrationOptions, CompletionOptions {
+export interface CompletionRegistrationOptions
+	extends TextDocumentRegistrationOptions, CompletionOptions {
 }
 ```
 
@@ -3377,10 +3949,12 @@ _Request_:
 * params: `CompletionParams` defined as follows:
 
 ```typescript
-export interface CompletionParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface CompletionParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 	/**
 	 * The completion context. This is only available if the client specifies
-	 * to send this using `ClientCapabilities.textDocument.completion.contextSupport === true`
+	 * to send this using the client capability
+	 * `completion.contextSupport === true`
 	 */
 	context?: CompletionContext;
 }
@@ -3397,7 +3971,8 @@ export namespace CompletionTriggerKind {
 
 	/**
 	 * Completion was triggered by a trigger character specified by
-	 * the `triggerCharacters` properties of the `CompletionRegistrationOptions`.
+	 * the `triggerCharacters` properties of the
+	 * `CompletionRegistrationOptions`.
 	 */
 	export const TriggerCharacter: 2 = 2;
 
@@ -3410,7 +3985,8 @@ export type CompletionTriggerKind = 1 | 2 | 3;
 
 
 /**
- * Contains additional information about the context in which a completion request is triggered.
+ * Contains additional information about the context in which a completion
+ * request is triggered.
  */
 export interface CompletionContext {
 	/**
@@ -3419,8 +3995,9 @@ export interface CompletionContext {
 	triggerKind: CompletionTriggerKind;
 
 	/**
-	 * The trigger character (a single character) that has trigger code complete.
-	 * Is undefined if `triggerKind !== CompletionTriggerKind.TriggerCharacter`
+	 * The trigger character (a single character) that has trigger code
+	 * complete. Is undefined if
+	 * `triggerKind !== CompletionTriggerKind.TriggerCharacter`
 	 */
 	triggerCharacter?: string;
 }
@@ -3431,8 +4008,8 @@ _Response_:
 
 ```typescript
 /**
- * Represents a collection of [completion items](#CompletionItem) to be presented
- * in the editor.
+ * Represents a collection of [completion items](#CompletionItem) to be
+ * presented in the editor.
  */
 export interface CompletionList {
 	/**
@@ -3471,8 +4048,8 @@ export namespace InsertTextFormat {
 export type InsertTextFormat = 1 | 2;
 
 /**
- * Completion item tags are extra annotations that tweak the rendering of a completion
- * item.
+ * Completion item tags are extra annotations that tweak the rendering of a
+ * completion item.
  *
  * @since 3.15.0
  */
@@ -3485,6 +4062,58 @@ export namespace CompletionItemTag {
 
 export type CompletionItemTag = 1;
 
+/**
+ * A special text edit to provide an insert and a replace operation.
+ *
+ * @since 3.16.0 - proposed state
+ */
+export interface InsertReplaceEdit {
+	/**
+	 * The string to be inserted.
+	 */
+	newText: string;
+
+	/**
+	 * The range if the insert is requested
+	 */
+	insert: Range;
+
+	/**
+	 * The range if the replace is requested.
+	 */
+	replace: Range;
+}
+
+/**
+ * How whitespace and indentation is handled during completion
+ * item insertion.
+ *
+ * @since 3.16.0 - proposed state
+ */
+export namespace InsertTextMode {
+	/**
+	 * The insertion or replace strings is taken as it is. If the
+	 * value is multi line the lines below the cursor will be
+	 * inserted using the indentation defined in the string value.
+	 * The client will not apply any kind of adjustments to the
+	 * string.
+	 */
+	export const asIs: 1 = 1;
+
+	/**
+	 * The editor adjusts leading whitespace of new lines so that
+	 * they match the indentation up to the cursor of the line for
+	 * which the item is accepted.
+	 *
+	 * Consider a line like this: <2tabs><cursor><3tabs>foo. Accepting a
+	 * multi line completion item is indented using 2 tabs and all
+	 * following lines inserted will be indented using 2 tabs as well.
+	 */
+	export const adjustIndentation: 2 = 2;
+}
+
+export type InsertTextMode = 1 | 2;
+
 export interface CompletionItem {
 	/**
 	 * The label of this completion item. By default
@@ -3498,7 +4127,7 @@ export interface CompletionItem {
 	 * an icon is chosen by the editor. The standardized set
 	 * of available values is defined in `CompletionItemKind`.
 	 */
-	kind?: number;
+	kind?: CompletionItemKind;
 
 	/**
 	 * Tags for this completion item.
@@ -3552,51 +4181,79 @@ export interface CompletionItem {
 	 *
 	 * The `insertText` is subject to interpretation by the client side.
 	 * Some tools might not take the string literally. For example
-	 * VS Code when code complete is requested in this example `con<cursor position>`
-	 * and a completion item with an `insertText` of `console` is provided it
-	 * will only insert `sole`. Therefore it is recommended to use `textEdit` instead
-	 * since it avoids additional client side interpretation.
+	 * VS Code when code complete is requested in this example
+	 * `con<cursor position>` and a completion item with an `insertText` of
+	 * `console` is provided it will only insert `sole`. Therefore it is
+	 * recommended to use `textEdit` instead since it avoids additional client
+	 * side interpretation.
 	 */
 	insertText?: string;
 
 	/**
-	 * The format of the insert text. The format applies to both the `insertText` property
-	 * and the `newText` property of a provided `textEdit`. If omitted defaults to
-	 * `InsertTextFormat.PlainText`.
+	 * The format of the insert text. The format applies to both the
+	 * `insertText` property and the `newText` property of a provided
+	 * `textEdit`. If omitted defaults to `InsertTextFormat.PlainText`.
 	 */
 	insertTextFormat?: InsertTextFormat;
 
 	/**
-	 * An edit which is applied to a document when selecting this completion. When an edit is provided the value of
-	 * `insertText` is ignored.
+	 * How whitespace and indentation is handled during completion
+	 * item insertion. If not provided the client's default value depends on
+	 * the `textDocument.completion.insertTextMode` client capability.
 	 *
-	 * *Note:* The range of the edit must be a single line range and it must contain the position at which completion
-	 * has been requested.
+	 * @since 3.16.0 - proposed state
 	 */
-	textEdit?: TextEdit;
+	insertTextMode?: InsertTextMode;
+
+	/**
+	 * An edit which is applied to a document when selecting this completion.
+	 * When an edit is provided the value of `insertText` is ignored.
+	 *
+	 * *Note:* The range of the edit must be a single line range and it must
+	 * contain the position at which completion has been requested.
+	 *
+	 * Most editors support two different operations when accepting a completion
+	 * item. One is to insert a completion text and the other is to replace an
+	 * existing text with a completion text. Since this can usually not be
+	 * predetermined by a server it can report both ranges. Clients need to
+	 * signal support for `InsertReplaceEdits` via the
+	 * `textDocument.completion.insertReplaceSupport` client capability
+	 * property.
+	 *
+	 * *Note 1:* The text edit's range as well as both ranges from an insert
+	 * replace edit must be a [single line] and they must contain the position
+	 * at which completion has been requested.
+	 * *Note 2:* If an `InsertReplaceEdit` is returned the edit's insert range
+	 * must be a prefix of the edit's replace range, that means it must be
+	 * contained and starting at the same position.
+	 *
+	 * @since 3.16.0 additional type `InsertReplaceEdit` - proposed state
+	 */
+	textEdit?: TextEdit | InsertReplaceEdit;
 
 	/**
 	 * An optional array of additional text edits that are applied when
-	 * selecting this completion. Edits must not overlap (including the same insert position)
-	 * with the main edit nor with themselves.
+	 * selecting this completion. Edits must not overlap (including the same
+	 * insert position) with the main edit nor with themselves.
 	 *
-	 * Additional text edits should be used to change text unrelated to the current cursor position
-	 * (for example adding an import statement at the top of the file if the completion item will
-	 * insert an unqualified type).
+	 * Additional text edits should be used to change text unrelated to the
+	 * current cursor position (for example adding an import statement at the
+	 * top of the file if the completion item will insert an unqualified type).
 	 */
 	additionalTextEdits?: TextEdit[];
 
 	/**
-	 * An optional set of characters that when pressed while this completion is active will accept it first and
-	 * then type that character. *Note* that all commit characters should have `length=1` and that superfluous
-	 * characters will be ignored.
+	 * An optional set of characters that when pressed while this completion is
+	 * active will accept it first and then type that character. *Note* that all
+	 * commit characters should have `length=1` and that superfluous characters
+	 * will be ignored.
 	 */
 	commitCharacters?: string[];
 
 	/**
-	 * An optional command that is executed *after* inserting this completion. *Note* that
-	 * additional modifications to the current document should be described with the
-	 * additionalTextEdits-property.
+	 * An optional command that is executed *after* inserting this completion.
+	 * *Note* that additional modifications to the current document should be
+	 * described with the additionalTextEdits-property.
 	 */
 	command?: Command;
 
@@ -3679,7 +4336,7 @@ The following variables can be used:
 
 Transformations allow you to modify the value of a variable before it is inserted. The definition of a transformation consists of three parts:
 
-1. A regular expression that is matched against the value of a variable, or the empty string when the variable cannot be resolved.
+1. A [regular expression](#regExp) that is matched against the value of a variable, or the empty string when the variable cannot be resolved.
 2. A "format string" that allows to reference matching groups from the regular expression. The format string allows for conditional inserts and simple modifications.
 3. Options that are passed to the regular expression.
 
@@ -3716,8 +4373,8 @@ format      ::= '$' int | '${' int '}'
                 | '${' int ':+' if '}'
                 | '${' int ':?' if ':' else '}'
                 | '${' int ':-' else '}' | '${' int ':' else '}'
-regex       ::= JavaScript Regular Expression value (ctor-string)
-options     ::= JavaScript Regular Expression option (ctor-options)
+regex       ::= Regular Expression value (ctor-string)
+options     ::= Regular Expression option (ctor-options)
 var         ::= [_a-zA-Z] [_a-zA-Z0-9]*
 int         ::= [0-9]+
 text        ::= .*
@@ -3751,8 +4408,9 @@ export interface HoverClientCapabilities {
 	dynamicRegistration?: boolean;
 
 	/**
-	 * Client supports the follow content formats for the content
-	 * property. The order describes the preferred format of the client.
+	 * Client supports the follow content formats if the content
+	 * property refers to a `literal of type MarkupContent`.
+	 * The order describes the preferred format of the client.
 	 */
 	contentFormat?: MarkupKind[];
 }
@@ -3769,7 +4427,8 @@ export interface HoverOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `HoverRegistrationOptions` defined as follows:
 ```typescript
-export interface HoverRegistrationOptions extends TextDocumentRegistrationOptions, HoverOptions {
+export interface HoverRegistrationOptions
+	extends TextDocumentRegistrationOptions, HoverOptions {
 }
 ```
 
@@ -3778,7 +4437,8 @@ _Request_:
 * params: `HoverParams` defined as follows:
 
 ```typescript
-export interface HoverParams extends TextDocumentPositionParams, WorkDoneProgressParams {
+export interface HoverParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams {
 }
 ```
 
@@ -3807,19 +4467,21 @@ Where `MarkedString` is defined as follows:
 
 ```typescript
 /**
- * MarkedString can be used to render human readable text. It is either a markdown string
- * or a code-block that provides a language and a code snippet. The language identifier
- * is semantically equal to the optional language identifier in fenced code blocks in GitHub
- * issues. See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+ * MarkedString can be used to render human readable text. It is either a
+ * markdown string or a code-block that provides a language and a code snippet.
+ * The language identifier is semantically equal to the optional language
+ * identifier in fenced code blocks in GitHub issues.
  *
  * The pair of a language and a value is an equivalent to markdown:
  * ```${language}
  * ${value}
  * ```
  *
- * Note that markdown strings will be sanitized - that means html will be escaped.
-* @deprecated use MarkupContent instead.
-*/
+ * Note that markdown strings will be sanitized - that means html will be
+ * escaped.
+ *
+ * @deprecated use MarkupContent instead.
+ */
 type MarkedString = string | { language: string; value: string };
 ```
 
@@ -3865,8 +4527,8 @@ export interface SignatureHelpClientCapabilities {
 		};
 
 		/**
-		 * The client support the `activeParameter` property on `SignatureInformation`
-		 * literal.
+		 * The client supports the `activeParameter` property on
+		 * `SignatureInformation` literal.
 		 *
 		 * @since 3.16.0 - proposed state
 		 */
@@ -3900,8 +4562,9 @@ export interface SignatureHelpOptions extends WorkDoneProgressOptions {
 	/**
 	 * List of characters that re-trigger signature help.
 	 *
-	 * These trigger characters are only active when signature help is already showing. All trigger characters
-	 * are also counted as re-trigger characters.
+	 * These trigger characters are only active when signature help is already
+	 * showing. All trigger characters are also counted as re-trigger
+	 * characters.
 	 *
 	 * @since 3.15.0
 	 */
@@ -3911,7 +4574,8 @@ export interface SignatureHelpOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `SignatureHelpRegistrationOptions` defined as follows:
 ```typescript
-export interface SignatureHelpRegistrationOptions extends TextDocumentRegistrationOptions, SignatureHelpOptions {
+export interface SignatureHelpRegistrationOptions
+	extends TextDocumentRegistrationOptions, SignatureHelpOptions {
 }
 ```
 
@@ -3920,10 +4584,12 @@ _Request_:
 * params: `SignatureHelpParams` defined as follows:
 
 ```typescript
-export interface SignatureHelpParams extends TextDocumentPositionParams, WorkDoneProgressParams {
+export interface SignatureHelpParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams {
 	/**
-	 * The signature help context. This is only available if the client specifies
-	 * to send this using the client capability  `textDocument.signatureHelp.contextSupport === true`
+	 * The signature help context. This is only available if the client
+	 * specifies to send this using the client capability
+	 * `textDocument.signatureHelp.contextSupport === true`
 	 *
 	 * @since 3.15.0
 	 */
@@ -3945,14 +4611,16 @@ export namespace SignatureHelpTriggerKind {
 	 */
 	export const TriggerCharacter: 2 = 2;
 	/**
-	 * Signature help was triggered by the cursor moving or by the document content changing.
+	 * Signature help was triggered by the cursor moving or by the document
+	 * content changing.
 	 */
 	export const ContentChange: 3 = 3;
 }
 export type SignatureHelpTriggerKind = 1 | 2 | 3;
 
 /**
- * Additional information about the context in which a signature help request was triggered.
+ * Additional information about the context in which a signature help request
+ * was triggered.
  *
  * @since 3.15.0
  */
@@ -3965,23 +4633,25 @@ export interface SignatureHelpContext {
 	/**
 	 * Character that caused signature help to be triggered.
 	 *
-	 * This is undefined when `triggerKind !== SignatureHelpTriggerKind.TriggerCharacter`
+	 * This is undefined when triggerKind !==
+	 * SignatureHelpTriggerKind.TriggerCharacter
 	 */
 	triggerCharacter?: string;
 
 	/**
 	 * `true` if signature help was already showing when it was triggered.
 	 *
-	 * Retriggers occur when the signature help is already active and can be caused by actions such as
-	 * typing a trigger character, a cursor move, or document content changes.
+	 * Retriggers occur when the signature help is already active and can be
+	 * caused by actions such as typing a trigger character, a cursor move, or
+	 * document content changes.
 	 */
 	isRetrigger: boolean;
 
 	/**
 	 * The currently active `SignatureHelp`.
 	 *
-	 * The `activeSignatureHelp` has its `SignatureHelp.activeSignature` field updated based on
-	 * the user navigating through available signatures.
+	 * The `activeSignatureHelp` has its `SignatureHelp.activeSignature` field
+	 * updated based on the user navigating through available signatures.
 	 */
 	activeSignatureHelp?: SignatureHelp;
 }
@@ -4014,7 +4684,7 @@ export interface SignatureHelp {
 	 * In future version of the protocol this property might become
 	 * mandatory to better express this.
 	 */
-	activeSignature?: number;
+	activeSignature?: uinteger;
 
 	/**
 	 * The active parameter of the active signature. If omitted or the value
@@ -4025,7 +4695,7 @@ export interface SignatureHelp {
 	 * mandatory to better express the active parameter if the
 	 * active signature does have any.
 	 */
-	activeParameter?: number;
+	activeParameter?: uinteger;
 }
 
 /**
@@ -4058,7 +4728,7 @@ export interface SignatureInformation {
 	 *
 	 * @since 3.16.0 - proposed state
 	 */
-	activeParameter?: number;
+	activeParameter?: uinteger;
 }
 
 /**
@@ -4070,14 +4740,16 @@ export interface ParameterInformation {
 	/**
 	 * The label of this parameter information.
 	 *
-	 * Either a string or an inclusive start and exclusive end offsets within its containing
-	 * signature label. (see SignatureInformation.label). The offsets are based on a UTF-16
-	 * string representation as `Position` and `Range` does.
+	 * Either a string or an inclusive start and exclusive end offsets within
+	 * its containing signature label. (see SignatureInformation.label). The
+	 * offsets are based on a UTF-16 string representation as `Position` and
+	 * `Range` does.
 	 *
-	 * *Note*: a label of type string should be a substring of its containing signature label.
-	 * Its intended use case is to highlight the parameter label part in the `SignatureInformation.label`.
+	 * *Note*: a label of type string should be a substring of its containing
+	 * signature label. Its intended use case is to highlight the parameter
+	 * label part in the `SignatureInformation.label`.
 	 */
-	label: string | [number, number];
+	label: string | [uinteger, uinteger];
 
 	/**
 	 * The human-readable doc-comment of this parameter. Will be shown
@@ -4104,9 +4776,9 @@ _Client Capability_:
 ```typescript
 export interface DeclarationClientCapabilities {
 	/**
-	 * Whether declaration supports dynamic registration. If this is set to `true`
-	 * the client supports the new `DeclarationRegistrationOptions` return value
-	 * for the corresponding server capability as well.
+	 * Whether declaration supports dynamic registration. If this is set to
+	 * `true` the client supports the new `DeclarationRegistrationOptions`
+	 * return value for the corresponding server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 
@@ -4128,7 +4800,8 @@ export interface DeclarationOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DeclarationRegistrationOptions` defined as follows:
 ```typescript
-export interface DeclarationRegistrationOptions extends DeclarationOptions, TextDocumentRegistrationOptions, StaticRegistrationOptions  {
+export interface DeclarationRegistrationOptions extends DeclarationOptions,
+	TextDocumentRegistrationOptions, StaticRegistrationOptions  {
 }
 ```
 
@@ -4137,7 +4810,8 @@ _Request_:
 * params: `DeclarationParams` defined as follows:
 
 ```typescript
-export interface DeclarationParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface DeclarationParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -4183,7 +4857,8 @@ export interface DefinitionOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DefinitionRegistrationOptions` defined as follows:
 ```typescript
-export interface DefinitionRegistrationOptions extends TextDocumentRegistrationOptions, DefinitionOptions {
+export interface DefinitionRegistrationOptions extends
+	TextDocumentRegistrationOptions, DefinitionOptions {
 }
 ```
 
@@ -4192,7 +4867,8 @@ _Request_:
 * params: `DefinitionParams` defined as follows:
 
 ```typescript
-export interface DefinitionParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface DefinitionParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -4216,9 +4892,9 @@ _Client Capability_:
 ```typescript
 export interface TypeDefinitionClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration. If this is set to `true`
-	 * the client supports the new `TypeDefinitionRegistrationOptions` return value
-	 * for the corresponding server capability as well.
+	 * Whether implementation supports dynamic registration. If this is set to
+	 * `true` the client supports the new `TypeDefinitionRegistrationOptions`
+	 * return value for the corresponding server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 
@@ -4242,7 +4918,9 @@ export interface TypeDefinitionOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `TypeDefinitionRegistrationOptions` defined as follows:
 ```typescript
-export interface TypeDefinitionRegistrationOptions extends TextDocumentRegistrationOptions, TypeDefinitionOptions, StaticRegistrationOptions {
+export interface TypeDefinitionRegistrationOptions extends
+	TextDocumentRegistrationOptions, TypeDefinitionOptions,
+	StaticRegistrationOptions {
 }
 ```
 
@@ -4251,7 +4929,8 @@ _Request_:
 * params: `TypeDefinitionParams` defined as follows:
 
 ```typescript
-export interface TypeDefinitionParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface TypeDefinitionParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -4275,9 +4954,9 @@ _Client Capability_:
 ```typescript
 export interface ImplementationClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration. If this is set to `true`
-	 * the client supports the new `ImplementationRegistrationOptions` return value
-	 * for the corresponding server capability as well.
+	 * Whether implementation supports dynamic registration. If this is set to
+	 * `true` the client supports the new `ImplementationRegistrationOptions`
+	 * return value for the corresponding server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 
@@ -4301,7 +4980,9 @@ export interface ImplementationOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `ImplementationRegistrationOptions` defined as follows:
 ```typescript
-export interface ImplementationRegistrationOptions extends TextDocumentRegistrationOptions, ImplementationOptions, StaticRegistrationOptions {
+export interface ImplementationRegistrationOptions extends
+	TextDocumentRegistrationOptions, ImplementationOptions,
+	StaticRegistrationOptions {
 }
 ```
 
@@ -4310,7 +4991,8 @@ _Request_:
 * params: `ImplementationParams` defined as follows:
 
 ```typescript
-export interface ImplementationParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface ImplementationParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -4347,7 +5029,8 @@ export interface ReferenceOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `ReferenceRegistrationOptions` defined as follows:
 ```typescript
-export interface ReferenceRegistrationOptions extends TextDocumentRegistrationOptions, ReferenceOptions {
+export interface ReferenceRegistrationOptions extends
+	TextDocumentRegistrationOptions, ReferenceOptions {
 }
 ```
 
@@ -4356,7 +5039,8 @@ _Request_:
 * params: `ReferenceParams` defined as follows:
 
 ```typescript
-export interface ReferenceParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface ReferenceParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 	context: ReferenceContext
 }
 
@@ -4403,7 +5087,8 @@ export interface DocumentHighlightOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentHighlightRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentHighlightRegistrationOptions extends TextDocumentRegistrationOptions, DocumentHighlightOptions {
+export interface DocumentHighlightRegistrationOptions extends
+	TextDocumentRegistrationOptions, DocumentHighlightOptions {
 }
 ```
 
@@ -4412,7 +5097,8 @@ _Request_:
 * params: `DocumentHighlightParams` defined as follows:
 
 ```typescript
-export interface DocumentHighlightParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface DocumentHighlightParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -4435,7 +5121,7 @@ export interface DocumentHighlight {
 	/**
 	 * The highlight kind, default is DocumentHighlightKind.Text.
 	 */
-	kind?: number;
+	kind?: DocumentHighlightKind;
 }
 
 /**
@@ -4457,6 +5143,8 @@ export namespace DocumentHighlightKind {
 	 */
 	export const Write = 3;
 }
+
+export type DocumentHighlightKind = 1 | 2 | 3;
 ```
 
 * partial result: `DocumentHighlight[]`
@@ -4469,6 +5157,8 @@ The document symbol request is sent from the client to the server. The returned
 - `SymbolInformation[]` which is a flat list of all symbols found in a given text document. Then neither the symbol's location range nor the symbol's container name should be used to infer a hierarchy.
 - `DocumentSymbol[]` which is a hierarchy of symbols found in a given text document.
 
+Servers should whenever possible return `DocumentSymbol` since it is the richer data structure.
+
 _Client Capability_:
 * property name (optional): `textDocument.documentSymbol`
 * property type: `DocumentSymbolClientCapabilities` defined as follows:
@@ -4481,7 +5171,8 @@ export interface DocumentSymbolClientCapabilities {
 	dynamicRegistration?: boolean;
 
 	/**
-	 * Specific capabilities for the `SymbolKind` in the `textDocument/documentSymbol` request.
+	 * Specific capabilities for the `SymbolKind` in the
+	 * `textDocument/documentSymbol` request.
 	 */
 	symbolKind?: {
 		/**
@@ -4515,6 +5206,14 @@ export interface DocumentSymbolClientCapabilities {
 		 */
 		valueSet: SymbolTag[]
 	}
+
+	/**
+	 * The client supports an additional label presented in the UI when
+	 * registering a document symbol provider.
+	 *
+	 * @since 3.16.0
+	 */
+	labelSupport?: boolean;
 }
 ```
 
@@ -4524,12 +5223,20 @@ _Server Capability_:
 
 ```typescript
 export interface DocumentSymbolOptions extends WorkDoneProgressOptions {
+	/**
+	 * A human-readable string that is shown when multiple outlines trees
+	 * are shown for the same document.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	label?: string;
 }
 ```
 
 _Registration Options_: `DocumentSymbolRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentSymbolRegistrationOptions extends TextDocumentRegistrationOptions, DocumentSymbolOptions {
+export interface DocumentSymbolRegistrationOptions extends
+	TextDocumentRegistrationOptions, DocumentSymbolOptions {
 }
 ```
 
@@ -4538,7 +5245,8 @@ _Request_:
 * params: `DocumentSymbolParams` defined as follows:
 
 ```typescript
-export interface DocumentSymbolParams extends WorkDoneProgressParams, PartialResultParams {
+export interface DocumentSymbolParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -4599,15 +5307,17 @@ export type SymbolTag = 1;
 
 
 /**
- * Represents programming constructs like variables, classes, interfaces etc. that appear in a document. Document symbols can be
- * hierarchical and they have two ranges: one that encloses its definition and one that points to its most interesting range,
- * e.g. the range of an identifier.
+ * Represents programming constructs like variables, classes, interfaces etc.
+ * that appear in a document. Document symbols can be hierarchical and they
+ * have two ranges: one that encloses its definition and one that points to its
+ * most interesting range, e.g. the range of an identifier.
  */
 export interface DocumentSymbol {
 
 	/**
-	 * The name of this symbol. Will be displayed in the user interface and therefore must not be
-	 * an empty string or a string only consisting of white spaces.
+	 * The name of this symbol. Will be displayed in the user interface and
+	 * therefore must not be an empty string or a string only consisting of
+	 * white spaces.
 	 */
 	name: string;
 
@@ -4622,7 +5332,7 @@ export interface DocumentSymbol {
 	kind: SymbolKind;
 
 	/**
-	 * Tags for this completion item.
+	 * Tags for this document symbol.
 	 *
 	 * @since 3.16.0
 	 */
@@ -4636,15 +5346,16 @@ export interface DocumentSymbol {
 	deprecated?: boolean;
 
 	/**
-	 * The range enclosing this symbol not including leading/trailing whitespace but everything else
-	 * like comments. This information is typically used to determine if the clients cursor is
-	 * inside the symbol to reveal in the symbol in the UI.
+	 * The range enclosing this symbol not including leading/trailing whitespace
+	 * but everything else like comments. This information is typically used to
+	 * determine if the clients cursor is inside the symbol to reveal in the
+	 * symbol in the UI.
 	 */
 	range: Range;
 
 	/**
-	 * The range that should be selected and revealed when this symbol is being picked, e.g the name of a function.
-	 * Must be contained by the `range`.
+	 * The range that should be selected and revealed when this symbol is being
+	 * picked, e.g. the name of a function. Must be contained by the `range`.
 	 */
 	selectionRange: Range;
 
@@ -4715,7 +5426,7 @@ The code action request is sent from the client to the server to compute command
 
 *Since version 3.16.0:* a client can offer a server to delay the computation of code action properties during a 'textDocument/codeAction' request:
 
-This is usful for cases where it is expensive to compute the value of a property (for example the `edit` property). Clients signal this through the `codeAction.resolveSupport` capability which lists all properties a client can resolve lazily. The server capability `codeActionProvider.resolveSupport` signals that a server will offer a `codeAction/resolve` route. To help servers to uniquely identify a code action in the resolve request, a code action literal can optional carry a data property. This is also guarded by an additional client capability `codeAction.dataSupport`. In general, a client should offer data support if it offers resolve support.
+This is useful for cases where it is expensive to compute the value of a property (for example the `edit` property). Clients signal this through the `codeAction.resolveSupport` capability which lists all properties a client can resolve lazily. The server capability `codeActionProvider.resolveSupport` signals that a server will offer a `codeAction/resolve` route. To help servers to uniquely identify a code action in the resolve request, a code action literal can optional carry a data property. This is also guarded by an additional client capability `codeAction.dataSupport`. In general, a client should offer data support if it offers resolve support. It should also be noted that servers shouldn't alter existing attributes of a code action in a codeAction/resolve request.
 
 > *Since version 3.8.0:* support for CodeAction literals to enable the following scenarios:
 
@@ -4794,6 +5505,17 @@ export interface CodeActionClientCapabilities {
 		*/
 		properties: string[];
 	};
+
+	/**
+	 * Whether th client honors the change annotations in
+	 * text edits and resource operations returned via the
+	 * `CodeAction#edit` property by for example presenting
+	 * the workspace edit in the user interface and asking
+	 * for confirmation.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	honorsChangeAnnotations?: boolean;
 }
 ```
 
@@ -4806,8 +5528,8 @@ export interface CodeActionOptions extends WorkDoneProgressOptions {
 	/**
 	 * CodeActionKinds that this server may return.
 	 *
-	 * The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the server
-	 * may list out every specific kind they provide.
+	 * The list of kinds may be generic, such as `CodeActionKind.Refactor`,
+	 * or the server may list out every specific kind they provide.
 	 */
 	codeActionKinds?: CodeActionKind[];
 
@@ -4823,7 +5545,8 @@ export interface CodeActionOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `CodeActionRegistrationOptions` defined as follows:
 ```typescript
-export interface CodeActionRegistrationOptions extends TextDocumentRegistrationOptions, CodeActionOptions {
+export interface CodeActionRegistrationOptions extends
+	TextDocumentRegistrationOptions, CodeActionOptions {
 }
 ```
 
@@ -4835,7 +5558,8 @@ _Request_:
 /**
  * Params for the CodeActionRequest
  */
-export interface CodeActionParams extends WorkDoneProgressParams, PartialResultParams {
+export interface CodeActionParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The document in which the command was invoked.
 	 */
@@ -4855,10 +5579,11 @@ export interface CodeActionParams extends WorkDoneProgressParams, PartialResultP
 /**
  * The kind of a code action.
  *
- * Kinds are a hierarchical list of identifiers separated by `.`, e.g. `"refactor.extract.function"`.
+ * Kinds are a hierarchical list of identifiers separated by `.`,
+ * e.g. `"refactor.extract.function"`.
  *
- * The set of kinds is open and client needs to announce the kinds it supports to the server during
- * initialization.
+ * The set of kinds is open and client needs to announce the kinds it supports
+ * to the server during initialization.
  */
 export type CodeActionKind = string;
 
@@ -4929,9 +5654,11 @@ export namespace CodeActionKind {
 	export const Source: CodeActionKind = 'source';
 
 	/**
-	 * Base kind for an organize imports source action: `source.organizeImports`.
+	 * Base kind for an organize imports source action:
+	 * `source.organizeImports`.
 	 */
-	export const SourceOrganizeImports: CodeActionKind = 'source.organizeImports';
+	export const SourceOrganizeImports: CodeActionKind =
+		'source.organizeImports';
 }
 
 /**
@@ -4940,10 +5667,11 @@ export namespace CodeActionKind {
  */
 export interface CodeActionContext {
 	/**
-	 * An array of diagnostics known on the client side overlapping the range provided to the
-	 * `textDocument/codeAction` request. They are provided so that the server knows which
-	 * errors are currently presented to the user for the given range. There is no guarantee
-	 * that these accurately reflect the error state of the resource. The primary parameter
+	 * An array of diagnostics known on the client side overlapping the range
+	 * provided to the `textDocument/codeAction` request. They are provided so
+	 * that the server knows which errors are currently presented to the user
+	 * for the given range. There is no guarantee that these accurately reflect
+	 * the error state of the resource. The primary parameter
 	 * to compute code actions is the provided range.
 	 */
 	diagnostics: Diagnostic[];
@@ -4951,8 +5679,8 @@ export interface CodeActionContext {
 	/**
 	 * Requested kind of actions to return.
 	 *
-	 * Actions not of this kind are filtered out by the client before being shown. So servers
-	 * can omit computing them.
+	 * Actions not of this kind are filtered out by the client before being
+	 * shown. So servers can omit computing them.
 	 */
 	only?: CodeActionKind[];
 }
@@ -4963,10 +5691,11 @@ _Response_:
 
 ```typescript
 /**
- * A code action represents a change that can be performed in code, e.g. to fix a problem or
- * to refactor code.
+ * A code action represents a change that can be performed in code, e.g. to fix
+ * a problem or to refactor code.
  *
- * A CodeAction must set either `edit` and/or a `command`. If both are supplied, the `edit` is applied first, then the `command` is executed.
+ * A CodeAction must set either `edit` and/or a `command`. If both are supplied,
+ * the `edit` is applied first, then the `command` is executed.
  */
 export interface CodeAction {
 
@@ -4988,11 +5717,12 @@ export interface CodeAction {
 	diagnostics?: Diagnostic[];
 
 	/**
-	 * Marks this as a preferred action. Preferred actions are used by the `auto fix` command and can be targeted
-	 * by keybindings.
+	 * Marks this as a preferred action. Preferred actions are used by the
+	 * `auto fix` command and can be targeted by keybindings.
 	 *
-	 * A quick fix should be marked preferred if it properly addresses the underlying error.
-	 * A refactoring should be marked preferred if it is the most reasonable choice of actions to take.
+	 * A quick fix should be marked preferred if it properly addresses the
+	 * underlying error. A refactoring should be marked preferred if it is the
+	 * most reasonable choice of actions to take.
 	 *
 	 * @since 3.15.0
 	 */
@@ -5001,24 +5731,27 @@ export interface CodeAction {
 	/**
 	 * Marks that the code action cannot currently be applied.
 	 *
-	 * Clients should follow the following guidelines regarding disabled code actions:
+	 * Clients should follow the following guidelines regarding disabled code
+	 * actions:
 	 *
-	 *   - Disabled code actions are not shown in automatic [lightbulb](https://code.visualstudio.com/docs/editor/editingevolved#_code-action)
-	 *     code action menu.
+	 * - Disabled code actions are not shown in automatic lightbulbs code
+	 *   action menus.
 	 *
-	 *   - Disabled actions are shown as faded out in the code action menu when the user request a more specific type
-	 *     of code action, such as refactorings.
+	 * - Disabled actions are shown as faded out in the code action menu when
+	 *   the user request a more specific type of code action, such as
+	 *   refactorings.
 	 *
-	 *   - If the user has a [keybinding](https://code.visualstudio.com/docs/editor/refactoring#_keybindings-for-code-actions)
-	 *     that auto applies a code action and only a disabled code actions are returned, the client should show the user an
-	 *     error message with `reason` in the editor.
+	 * - If the user has a keybinding that auto applies a code action and only
+	 *   a disabled code actions are returned, the client should show the user
+	 *   an error message with `reason` in the editor.
 	 *
 	 * @since 3.16.0
 	 */
 	disabled?: {
 
 		/**
-		 * Human readable description of why the code action is currently disabled.
+		 * Human readable description of why the code action is currently
+		 * disabled.
 		 *
 		 * This is displayed in the code actions UI.
 		 */
@@ -5056,6 +5789,22 @@ export interface CodeAction {
 The request is sent from the client to the server to resolve additional information for a given code action. This is usually used to compute
 the `edit` property of a code action to avoid its unnecessary computation during the `textDocument/codeAction` request.
 
+Consider the clients announces the `edit` property as a property that can be resolved lazy using the client capability
+
+```typescript
+textDocument.codeAction.resolveSupport = { properties: ['edit']};
+```
+
+then a code action
+
+```typescript
+{
+    "title": "Do Foo"
+}
+```
+
+needs to be resolved using the `codeAction/resolve` request before it can be applied.
+
 _Client Capability_:
 * property name (optional): `textDocument.codeAction.resolveSupport`
 * property type: `{ properties: string[]; }`
@@ -5100,7 +5849,8 @@ export interface CodeLensOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `CodeLensRegistrationOptions` defined as follows:
 ```typescript
-export interface CodeLensRegistrationOptions extends TextDocumentRegistrationOptions, CodeLensOptions {
+export interface CodeLensRegistrationOptions extends
+	TextDocumentRegistrationOptions, CodeLensOptions {
 }
 ```
 
@@ -5125,12 +5875,14 @@ _Response_:
  * A code lens represents a command that should be shown along with
  * source text, like the number of references, a way to run tests, etc.
  *
- * A code lens is _unresolved_ when no command is associated to it. For performance
- * reasons the creation of a code lens and resolving should be done in two stages.
+ * A code lens is _unresolved_ when no command is associated to it. For
+ * performance reasons the creation of a code lens and resolving should be done
+ * in two stages.
  */
 interface CodeLens {
 	/**
-	 * The range in which this code lens is valid. Should only span a single line.
+	 * The range in which this code lens is valid. Should only span a single
+	 * line.
 	 */
 	range: Range;
 
@@ -5161,6 +5913,42 @@ _Response_:
 * result: `CodeLens`
 * error: code and message set in case an exception happens during the code lens resolve request.
 
+#### <a href="#codeLens_refresh" name="codeLens_refresh" class="anchor">Code Lens Refresh Request (:arrow_right_hook:)</a>
+
+> *Since version 3.16.0*
+
+The `workspace/codeLens/refresh` request is sent from the server to the client. Servers can use it to ask clients to refresh the code lenses currently shown in editors. As a result the client should ask the server to recompute the code lenses for these editors. This is useful if a server detects a configuration change which requires a re-calculation of all code lenses. Note that the client still has the freedom to delay the re-calculation of the code lenses if for example an editor is currently not visible.
+
+_Client Capability_:
+
+* property name (optional): `workspace.codeLens`
+* property type: `CodeLensWorkspaceClientCapabilities` defined as follows:
+
+```typescript
+export interface CodeLensWorkspaceClientCapabilities {
+	/**
+	 * Whether the client implementation supports a refresh request sent from the
+	 * server to the client.
+	 *
+	 * Note that this event is global and will force the client to refresh all
+	 * code lenses currently shown. It should be used with absolute care and is
+	 * useful for situation where a server for example detect a project wide
+	 * change that requires such a calculation.
+	 */
+	refreshSupport?: boolean;
+}
+```
+
+_Request_:
+
+* method: `workspace/codeLens/refresh`
+* params: none
+
+_Response_:
+
+* result: void
+* error: code and message set in case an exception happens during the 'workspace/codeLens/refresh' request
+
 #### <a href="#textDocument_documentLink" name="textDocument_documentLink" class="anchor">Document Link Request (:leftwards_arrow_with_hook:)</a>
 
 The document links request is sent from the client to the server to request the location of links in a document.
@@ -5200,7 +5988,8 @@ export interface DocumentLinkOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentLinkRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentLinkRegistrationOptions extends TextDocumentRegistrationOptions, DocumentLinkOptions {
+export interface DocumentLinkRegistrationOptions extends
+	TextDocumentRegistrationOptions, DocumentLinkOptions {
 }
 ```
 
@@ -5209,7 +5998,8 @@ _Request_:
 * params: `DocumentLinkParams` defined as follows:
 
 ```typescript
-interface DocumentLinkParams extends WorkDoneProgressParams, PartialResultParams {
+interface DocumentLinkParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The document to provide document links for.
 	 */
@@ -5222,8 +6012,8 @@ _Response_:
 
 ```typescript
 /**
- * A document link is a range in a text document that links to an internal or external resource, like another
- * text document or a web site.
+ * A document link is a range in a text document that links to an internal or
+ * external resource, like another text document or a web site.
  */
 interface DocumentLink {
 	/**
@@ -5239,9 +6029,10 @@ interface DocumentLink {
 	/**
 	 * The tooltip text when you hover over this link.
 	 *
-	 * If a tooltip is provided, is will be displayed in a string that includes instructions on how to
-	 * trigger the link, such as `{0} (ctrl + click)`. The specific instructions vary depending on OS,
-	 * user settings, and localization.
+	 * If a tooltip is provided, is will be displayed in a string that includes
+	 * instructions on how to trigger the link, such as `{0} (ctrl + click)`.
+	 * The specific instructions vary depending on OS, user settings, and
+	 * localization.
 	 *
 	 * @since 3.15.0
 	 */
@@ -5303,7 +6094,9 @@ export interface DocumentColorOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentColorRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentColorRegistrationOptions extends TextDocumentRegistrationOptions, StaticRegistrationOptions, DocumentColorOptions {
+export interface DocumentColorRegistrationOptions extends
+	TextDocumentRegistrationOptions, StaticRegistrationOptions,
+	DocumentColorOptions {
 }
 ```
 
@@ -5313,7 +6106,8 @@ _Request_:
 * params: `DocumentColorParams` defined as follows
 
 ```typescript
-interface DocumentColorParams extends WorkDoneProgressParams, PartialResultParams {
+interface DocumentColorParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -5345,22 +6139,22 @@ interface Color {
 	/**
 	 * The red component of this color in the range [0-1].
 	 */
-	readonly red: number;
+	readonly red: decimal;
 
 	/**
 	 * The green component of this color in the range [0-1].
 	 */
-	readonly green: number;
+	readonly green: decimal;
 
 	/**
 	 * The blue component of this color in the range [0-1].
 	 */
-	readonly blue: number;
+	readonly blue: decimal;
 
 	/**
 	 * The alpha component of this color in the range [0-1].
 	 */
-	readonly alpha: number;
+	readonly alpha: decimal;
 }
 ```
 * partial result: `ColorInformation[]`
@@ -5382,7 +6176,8 @@ _Request_:
 * params: `ColorPresentationParams` defined as follows
 
 ```typescript
-interface ColorPresentationParams extends WorkDoneProgressParams, PartialResultParams {
+interface ColorPresentationParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -5407,19 +6202,20 @@ _Response_:
 interface ColorPresentation {
 	/**
 	 * The label of this color presentation. It will be shown on the color
-	 * picker header. By default this is also the text that is inserted when selecting
-	 * this color presentation.
+	 * picker header. By default this is also the text that is inserted when
+	 * selecting this color presentation.
 	 */
 	label: string;
 	/**
 	 * An [edit](#TextEdit) which is applied to a document when selecting
-	 * this presentation for the color.  When `falsy` the [label](#ColorPresentation.label)
-	 * is used.
+	 * this presentation for the color.  When `falsy` the
+	 * [label](#ColorPresentation.label) is used.
 	 */
 	textEdit?: TextEdit;
 	/**
-	 * An optional array of additional [text edits](#TextEdit) that are applied when
-	 * selecting this color presentation. Edits must not overlap with the main [edit](#ColorPresentation.textEdit) nor with themselves.
+	 * An optional array of additional [text edits](#TextEdit) that are applied
+	 * when selecting this color presentation. Edits must not overlap with the
+	 * main [edit](#ColorPresentation.textEdit) nor with themselves.
 	 */
 	additionalTextEdits?: TextEdit[];
 }
@@ -5456,7 +6252,8 @@ export interface DocumentFormattingOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `DocumentFormattingRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentFormattingRegistrationOptions extends TextDocumentRegistrationOptions, DocumentFormattingOptions {
+export interface DocumentFormattingRegistrationOptions extends
+	TextDocumentRegistrationOptions, DocumentFormattingOptions {
 }
 ```
 
@@ -5484,7 +6281,7 @@ interface FormattingOptions {
 	/**
 	 * Size of a tab in spaces.
 	 */
-	tabSize: number;
+	tabSize: uinteger;
 
 	/**
 	 * Prefer spaces over tabs.
@@ -5515,7 +6312,7 @@ interface FormattingOptions {
 	/**
 	 * Signature for further properties.
 	 */
-	[key: string]: boolean | number | string;
+	[key: string]: boolean | integer | string;
 }
 ```
 
@@ -5545,13 +6342,15 @@ _Server Capability_:
 * property type: `boolean | DocumentRangeFormattingOptions` where `DocumentRangeFormattingOptions` is defined as follows:
 
 ```typescript
-export interface DocumentRangeFormattingOptions extends WorkDoneProgressOptions {
+export interface DocumentRangeFormattingOptions extends
+	WorkDoneProgressOptions {
 }
 ```
 
 _Registration Options_: `DocumentFormattingRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentRangeFormattingRegistrationOptions extends TextDocumentRegistrationOptions, DocumentRangeFormattingOptions {
+export interface DocumentRangeFormattingRegistrationOptions extends
+	TextDocumentRegistrationOptions, DocumentRangeFormattingOptions {
 }
 ```
 
@@ -5619,7 +6418,8 @@ export interface DocumentOnTypeFormattingOptions {
 
 _Registration Options_: `DocumentOnTypeFormattingRegistrationOptions` defined as follows:
 ```typescript
-export interface DocumentOnTypeFormattingRegistrationOptions extends TextDocumentRegistrationOptions, DocumentOnTypeFormattingOptions {
+export interface DocumentOnTypeFormattingRegistrationOptions extends
+	TextDocumentRegistrationOptions, DocumentOnTypeFormattingOptions {
 }
 ```
 
@@ -5654,6 +6454,13 @@ _Client Capability_:
 * property type: `RenameClientCapabilities` defined as follows:
 
 ```typescript
+export namespace PrepareSupportDefaultBehavior {
+	/**
+	 * The client's default behavior is to select the identifier
+	 * according the to language's syntax rule.
+	 */
+	 export const Identifier: 1 = 1;
+}
 export interface RenameClientCapabilities {
 	/**
 	 * Whether rename supports dynamic registration.
@@ -5669,11 +6476,26 @@ export interface RenameClientCapabilities {
 	prepareSupport?: boolean;
 
 	/**
-	 * Client supports the default behavior result (`{ defaultBehavior: boolean }`).
+	 * Client supports the default behavior result
+	 * (`{ defaultBehavior: boolean }`).
+	 *
+	 * The value indicates the default behavior used by the
+	 * client.
 	 *
 	 * @since version 3.16.0
 	 */
-	prepareSupportDefaultBehavior?: boolean;
+	prepareSupportDefaultBehavior?: PrepareSupportDefaultBehavior;
+
+	/**
+	 * Whether th client honors the change annotations in
+	 * text edits and resource operations returned via the
+	 * rename request's workspace edit by for example presenting
+	 * the workspace edit in the user interface and asking
+	 * for confirmation.
+	 *
+	 * @since 3.16.0 - proposed state
+	 */
+	honorsChangeAnnotations?: boolean;
 }
 ```
 
@@ -5694,7 +6516,8 @@ export interface RenameOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `RenameRegistrationOptions` defined as follows:
 ```typescript
-export interface RenameRegistrationOptions extends TextDocumentRegistrationOptions, RenameOptions {
+export interface RenameRegistrationOptions extends
+	TextDocumentRegistrationOptions, RenameOptions {
 }
 ```
 
@@ -5703,7 +6526,8 @@ _Request_:
 * params: `RenameParams` defined as follows
 
 ```typescript
-interface RenameParams extends TextDocumentPositionParams, WorkDoneProgressParams {
+interface RenameParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams {
 	/**
 	 * The new name of the symbol. If the given name is not valid the
 	 * request must return a [ResponseError](#ResponseError) with an
@@ -5732,7 +6556,7 @@ export interface PrepareRenameParams extends TextDocumentPositionParams {
 ```
 
 _Response_:
-* result: [`Range`](#range) \| `{ range: Range, placeholder: string }` \| `{ defaultBehavior: boolean }` \| `null` describing the range of the string to rename and optionally a placeholder text of the string content to be renamed. If `{ defaultBehavior: boolean }` is returned (since 3.16) the rename position is valid and the client should use its default behavior to compute the rename range. If `null` is returned then it is deemed that a 'textDocument/rename' request is not valid at the given position.
+* result: `Range | { range: Range, placeholder: string } | { defaultBehavior: boolean } | null` describing a [`Range`](#range) of the string to rename and optionally a placeholder text of the string content to be renamed. If `{ defaultBehavior: boolean }` is returned (since 3.16) the rename position is valid and the client should use its default behavior to compute the rename range. If `null` is returned then it is deemed that a 'textDocument/rename' request is not valid at the given position.
 * error: code and message set in case the element can't be renamed. Clients should show the information in their user interface.
 
 #### <a href="#textDocument_foldingRange" name="textDocument_foldingRange" class="anchor">Folding Range Request (:leftwards_arrow_with_hook:)</a>
@@ -5748,19 +6572,22 @@ _Client Capability_:
 ```typescript
 export interface FoldingRangeClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration for folding range providers. If this is set to `true`
-	 * the client supports the new `FoldingRangeRegistrationOptions` return value for the corresponding server
-	 * capability as well.
+	 * Whether implementation supports dynamic registration for folding range
+	 * providers. If this is set to `true` the client supports the new
+	 * `FoldingRangeRegistrationOptions` return value for the corresponding
+	 * server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 	/**
-	 * The maximum number of folding ranges that the client prefers to receive per document. The value serves as a
-	 * hint, servers are free to follow the limit.
+	 * The maximum number of folding ranges that the client prefers to receive
+	 * per document. The value serves as a hint, servers are free to follow the
+	 * limit.
 	 */
-	rangeLimit?: number;
+	rangeLimit?: uinteger;
 	/**
-	 * If set, the client signals that it only supports folding complete lines. If set, client will
-	 * ignore specified `startCharacter` and `endCharacter` properties in a FoldingRange.
+	 * If set, the client signals that it only supports folding complete lines.
+	 * If set, client will ignore specified `startCharacter` and `endCharacter`
+	 * properties in a FoldingRange.
 	 */
 	lineFoldingOnly?: boolean;
 }
@@ -5777,7 +6604,9 @@ export interface FoldingRangeOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `FoldingRangeRegistrationOptions` defined as follows:
 ```typescript
-export interface FoldingRangeRegistrationOptions extends TextDocumentRegistrationOptions, FoldingRangeOptions, StaticRegistrationOptions {
+export interface FoldingRangeRegistrationOptions extends
+	TextDocumentRegistrationOptions, FoldingRangeOptions,
+	StaticRegistrationOptions {
 }
 ```
 
@@ -5787,7 +6616,8 @@ _Request_:
 * params: `FoldingRangeParams` defined as follows
 
 ```typescript
-export interface FoldingRangeParams extends WorkDoneProgressParams, PartialResultParams {
+export interface FoldingRangeParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -5818,34 +6648,43 @@ export enum FoldingRangeKind {
 }
 
 /**
- * Represents a folding range.
+ * Represents a folding range. To be valid, start and end line must be bigger
+ * than zero and smaller than the number of lines in the document. Clients
+ * are free to ignore invalid ranges.
  */
 export interface FoldingRange {
 
 	/**
-	 * The zero-based line number from where the folded range starts.
+	 * The zero-based start line of the range to fold. The folded area starts
+	 * after the line's last character. To be valid, the end must be zero or
+	 * larger and smaller than the number of lines in the document.
 	 */
-	startLine: number;
+	startLine: uinteger;
 
 	/**
-	 * The zero-based character offset from where the folded range starts. If not defined, defaults to the length of the start line.
+	 * The zero-based character offset from where the folded range starts. If
+	 * not defined, defaults to the length of the start line.
 	 */
-	startCharacter?: number;
+	startCharacter?: uinteger;
 
 	/**
-	 * The zero-based line number where the folded range ends.
+	 * The zero-based end line of the range to fold. The folded area ends with
+	 * the line's last character. To be valid, the end must be zero or larger
+	 * and smaller than the number of lines in the document.
 	 */
-	endLine: number;
+	endLine: uinteger;
 
 	/**
-	 * The zero-based character offset before the folded range ends. If not defined, defaults to the length of the end line.
+	 * The zero-based character offset before the folded range ends. If not
+	 * defined, defaults to the length of the end line.
 	 */
-	endCharacter?: number;
+	endCharacter?: uinteger;
 
 	/**
-	 * Describes the kind of the folding range such as `comment` or `region`. The kind
-	 * is used to categorize folding ranges and used by commands like 'Fold all comments'. See
-	 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of standardized kinds.
+	 * Describes the kind of the folding range such as `comment` or `region`.
+	 * The kind is used to categorize folding ranges and used by commands like
+	 * 'Fold all comments'. See [FoldingRangeKind](#FoldingRangeKind) for an
+	 * enumeration of standardized kinds.
 	 */
 	kind?: string;
 }
@@ -5871,9 +6710,10 @@ _Client Capability_:
 ```typescript
 export interface SelectionRangeClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration for selection range providers. If this is set to `true`
-	 * the client supports the new `SelectionRangeRegistrationOptions` return value for the corresponding server
-	 * capability as well.
+	 * Whether implementation supports dynamic registration for selection range
+	 * providers. If this is set to `true` the client supports the new
+	 * `SelectionRangeRegistrationOptions` return value for the corresponding
+	 * server capability as well.
 	 */
 	dynamicRegistration?: boolean;
 }
@@ -5890,7 +6730,9 @@ export interface SelectionRangeOptions extends WorkDoneProgressOptions {
 
 _Registration Options_: `SelectionRangeRegistrationOptions` defined as follows:
 ```typescript
-export interface SelectionRangeRegistrationOptions extends SelectionRangeOptions, TextDocumentRegistrationOptions, StaticRegistrationOptions {
+export interface SelectionRangeRegistrationOptions extends
+	SelectionRangeOptions, TextDocumentRegistrationOptions,
+	StaticRegistrationOptions {
 }
 ```
 
@@ -5900,7 +6742,8 @@ _Request_:
 * params: `SelectionRangeParams` defined as follows:
 
 ```typescript
-export interface SelectionRangeParams extends WorkDoneProgressParams, PartialResultParams {
+export interface SelectionRangeParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -5924,7 +6767,8 @@ export interface SelectionRange {
      */
     range: Range;
     /**
-     * The parent selection range containing this range. Therefore `parent.range` must contain `this.range`.
+     * The parent selection range containing this range. Therefore
+	 * `parent.range` must contain `this.range`.
      */
     parent?: SelectionRange;
 }
@@ -5950,9 +6794,10 @@ _Client Capability_:
 ```typescript
 interface CallHierarchyClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration. If this is set to `true`
-	 * the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
-	 * return value for the corresponding server capability as well.
+	 * Whether implementation supports dynamic registration. If this is set to
+	 * `true` the client supports the new `(TextDocumentRegistrationOptions &
+	 * StaticRegistrationOptions)` return value for the corresponding server
+	 * capability as well.
 	 */
 	dynamicRegistration?: boolean;
 }
@@ -5971,7 +6816,9 @@ export interface CallHierarchyOptions extends WorkDoneProgressOptions {
 _Registration Options_: `CallHierarchyRegistrationOptions` defined as follows:
 
 ```typescript
-export interface CallHierarchyRegistrationOptions extends TextDocumentRegistrationOptions, CallHierarchyOptions, StaticRegistrationOptions {
+export interface CallHierarchyRegistrationOptions extends
+	TextDocumentRegistrationOptions, CallHierarchyOptions,
+	StaticRegistrationOptions {
 }
 ```
 
@@ -5981,7 +6828,8 @@ _Request_:
 * params: `CallHierarchyPrepareParams` defined as follows:
 
 ```typescript
-export interface CallHierarchyPrepareParams extends TextDocumentPositionParams, WorkDoneProgressParams {
+export interface CallHierarchyPrepareParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams {
 }
 ```
 
@@ -6017,15 +6865,23 @@ export interface CallHierarchyItem {
 	uri: DocumentUri;
 
 	/**
-	 * The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g. comments and code.
+	 * The range enclosing this symbol not including leading/trailing whitespace
+	 * but everything else, e.g. comments and code.
 	 */
 	range: Range;
 
 	/**
-	 * The range that should be selected and revealed when this symbol is being picked, e.g. the name of a function.
-	 * Must be contained by the [`range`](#CallHierarchyItem.range).
+	 * The range that should be selected and revealed when this symbol is being
+	 * picked, e.g. the name of a function. Must be contained by the
+	 * [`range`](#CallHierarchyItem.range).
 	 */
 	selectionRange: Range;
+
+	/**
+	 * A data entry field that is preserved between a call hierarchy prepare and
+	 * incoming calls or outgoing calls requests.
+	 */
+	data?: unknown;
 }
 ```
 
@@ -6043,7 +6899,8 @@ _Request_:
 * params: `CallHierarchyIncomingCallsParams` defined as follows:
 
 ```typescript
-export interface CallHierarchyIncomingCallsParams extends WorkDoneProgressParams, PartialResultParams {
+export interface CallHierarchyIncomingCallsParams extends
+	WorkDoneProgressParams, PartialResultParams {
 	item: CallHierarchyItem;
 }
 ```
@@ -6083,7 +6940,8 @@ _Request_:
 * params: `CallHierarchyOutgoingCallsParams` defined as follows:
 
 ```typescript
-export interface CallHierarchyOutgoingCallsParams extends WorkDoneProgressParams, PartialResultParams {
+export interface CallHierarchyOutgoingCallsParams extends
+	WorkDoneProgressParams, PartialResultParams {
 	item: CallHierarchyItem;
 }
 ```
@@ -6101,9 +6959,8 @@ export interface CallHierarchyOutgoingCall {
 	to: CallHierarchyItem;
 
 	/**
-	 * The range at which this item is called. This is the range relative to the caller, e.g the item
-	 * passed to [`provideCallHierarchyOutgoingCalls`](#CallHierarchyItemProvider.provideCallHierarchyOutgoingCalls)
-	 * and not [`this.to`](#CallHierarchyOutgoingCall.to).
+	 * The range at which this item is called. This is the range relative to
+	 * the caller, e.g the item passed to `callHierarchy/outgoingCalls` request.
 	 */
 	fromRanges: Range[];
 }
@@ -6120,11 +6977,15 @@ The request is sent from the client to the server to resolve semantic tokens for
 
 _General Concepts_
 
-Tokens are represented using one token type combined with n token modiifiers. A token type is something like `class` or `function` and token modifiers are like `static` or `async`. The protocol defines a set of token types and modifiers but clients are allowed to extend these and announce the values they support in the corresponding client capability. The predefined values are:
+Tokens are represented using one token type combined with n token modifiers. A token type is something like `class` or `function` and token modifiers are like `static` or `async`. The protocol defines a set of token types and modifiers but clients are allowed to extend these and announce the values they support in the corresponding client capability. The predefined values are:
 
 ```typescript
 export enum SemanticTokenTypes {
 	namespace = 'namespace',
+	/**
+	 * Represents a generic type. Acts as a fallback for types which
+	 * can't be mapped to a specific type like class or enum.
+	 */
 	type = 'type',
 	class = 'class',
 	enum = 'enum',
@@ -6137,7 +6998,7 @@ export enum SemanticTokenTypes {
 	enumMember = 'enumMember',
 	event = 'event',
 	function = 'function',
-	member = 'member',
+	method = 'method',
 	macro = 'macro',
 	keyword = 'keyword',
 	modifier = 'modifier',
@@ -6193,20 +7054,24 @@ export interface SemanticTokensLegend {
 Token types are looked up by index, so a `tokenType` value of `1` means `tokenTypes[1]`. Since a token type can have n modifiers, multiple token modifiers can be set by using bit flags,
 so a `tokenModifier` value of `3` is first viewed as binary `0b00000011`, which means `[tokenModifiers[0], tokenModifiers[1]]` because bits 0 and 1 are set.
 
-There are different way how the position of a token can be expressed in a file. Absolute positions or relative positons. The protocol for the token format `relative` uses relative positions, because most tokens remain stable relative to each other when edits are made in a file. This simplies the computation of a delta if a server supports it. So each token is represented using 5 integers. A specific token `i` in the file consists of the following array indices:
+There are different ways how the position of a token can be expressed in a file. Absolute positions or relative positions. The protocol for the token format `relative` uses relative positions, because most tokens remain stable relative to each other when edits are made in a file. This simplifies the computation of a delta if a server supports it. So each token is represented using 5 integers. A specific token `i` in the file consists of the following array indices:
 
 - at index `5*i`   - `deltaLine`: token line number, relative to the previous token
 - at index `5*i+1` - `deltaStart`: token start character, relative to the previous token (relative to 0 or the previous token's start if they are on the same line)
-- at index `5*i+2` - `length`: the length of the token. A token cannot be multiline.
+- at index `5*i+2` - `length`: the length of the token.
 - at index `5*i+3` - `tokenType`: will be looked up in `SemanticTokensLegend.tokenTypes`. We currently ask that `tokenType` < 65536.
 - at index `5*i+4` - `tokenModifiers`: each set bit will be looked up in `SemanticTokensLegend.tokenModifiers`
 
-Lets look at a concrete example for encoding a file with 3 tokens in a number array. We start with absolute positions to demonstrate how they can easily be transformed into relative positions:
+Whether a token can span multiple lines is defined by the client capability `multilineTokenSupport`. The client capability `overlappingTokenSupport` defines whether tokens can overlap each other.
+
+Lets look at a concrete example which uses single line tokens without overlaps for encoding a file with 3 tokens in a number array. We start with absolute positions to demonstrate how they can easily be transformed into relative positions:
 
 ```typescript
-{ line: 2, startChar:  5, length: 3, tokenType: "property",  tokenModifiers: ["private", "static"] },
-{ line: 2, startChar: 10, length: 4, tokenType: "type",      tokenModifiers: [] },
-{ line: 5, startChar:  2, length: 7, tokenType: "class",     tokenModifiers: [] }
+{ line: 2, startChar:  5, length: 3, tokenType: "property",
+	tokenModifiers: ["private", "static"]
+},
+{ line: 2, startChar: 10, length: 4, tokenType: "type", tokenModifiers: [] },
+{ line: 5, startChar:  2, length: 7, tokenType: "class", tokenModifiers: [] }
 ```
 
 First of all, a legend must be devised. This legend must be provided up-front on registration and capture all possible token types and modifiers. For the example we use this legend:
@@ -6244,9 +7109,11 @@ Finally, the last step is to inline each of the 5 fields for a token in a single
 Now assume that the user types a new empty line at the beginning of the file which results in the following tokens in the file:
 
 ```typescript
-{ line: 3, startChar:  5, length: 3, tokenType: "property",  tokenModifiers: ["private", "static"] },
-{ line: 3, startChar: 10, length: 4, tokenType: "type",      tokenModifiers: [] },
-{ line: 6, startChar:  2, length: 7, tokenType: "class",     tokenModifiers: [] }
+{ line: 3, startChar:  5, length: 3, tokenType: "property",
+	tokenModifiers: ["private", "static"]
+},
+{ line: 3, startChar: 10, length: 4, tokenType: "type", tokenModifiers: [] },
+{ line: 6, startChar:  2, length: 7, tokenType: "class", tokenModifiers: [] }
 ```
 
 Running the same transformations as above will result in the following number array:
@@ -6259,9 +7126,9 @@ Running the same transformations as above will result in the following number ar
 The delta is now expressed on these number arrays without any form of interpretation what these numbers mean. This is comparable to the text document edits send from the server to the client to modify the content of a file. Those are character based and don't make any assumption about the meaning of the characters. So `[  2,5,3,0,3,  0,5,4,1,0,  3,2,7,2,0 ]` can be transformed into `[  3,5,3,0,3,  0,5,4,1,0,  3,2,7,2,0]` using the following edit description: `{ start:  0, deleteCount: 1, data: [3] }` which tells the client to simply replace the first number (e.g. `2`) in the array with `3`.
 
 
-_Client Capability_
+_Client Capability_:
 
-The following client capabilities are defined for semantic tokens:
+The following client capabilities are defined for semantic token requests sent from the client to the server:
 
 * property name (optional): `textDocument.semanticTokens`
 * property type: `SemanticTokensClientCapabilities` defined as follows:
@@ -6269,9 +7136,10 @@ The following client capabilities are defined for semantic tokens:
 ```typescript
 interface SemanticTokensClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration. If this is set to `true`
-	 * the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
-	 * return value for the corresponding server capability as well.
+	 * Whether implementation supports dynamic registration. If this is set to
+	 * `true` the client supports the new `(TextDocumentRegistrationOptions &
+	 * StaticRegistrationOptions)` return value for the corresponding server
+	 * capability as well.
 	 */
 	dynamicRegistration?: boolean;
 
@@ -6280,20 +7148,20 @@ interface SemanticTokensClientCapabilities {
 	 */
 	requests: {
 		/**
-		 * The client will send the `textDocument/semanticTokens/range` request if
-		 * the server provides a corresponding handler.
+		 * The client will send the `textDocument/semanticTokens/range` request
+		 * if the server provides a corresponding handler.
 		 */
 		range?: boolean | {
 		};
 
 		/**
-		 * The client will send the `textDocument/semanticTokens/full` request if
-		 * the server provides a corresponding handler.
+		 * The client will send the `textDocument/semanticTokens/full` request
+		 * if the server provides a corresponding handler.
 		 */
 		full?: boolean | {
 			/**
-			 * The client will send the `textDocument/semanticTokens/full/delta` request if
-			 * the server provides a corresponding handler.
+			 * The client will send the `textDocument/semanticTokens/full/delta`
+			 * request if the server provides a corresponding handler.
 			*/
 			delta?: boolean
 		}
@@ -6313,10 +7181,20 @@ interface SemanticTokensClientCapabilities {
 	 * The formats the clients supports.
 	 */
 	formats: TokenFormat[];
+
+	/**
+	 * Whether the client supports tokens that can overlap each other.
+	 */
+	overlappingTokenSupport?: boolean;
+
+	/**
+	 * Whether the client supports tokens that can span multiple lines.
+	 */
+	multilineTokenSupport?: boolean;
 }
 ```
 
-_Server Capability_
+_Server Capability_:
 
 The following server capabilities are defined for semantic tokens:
 
@@ -6352,11 +7230,13 @@ export interface SemanticTokensOptions extends WorkDoneProgressOptions {
 _Registration Options_: `SemanticTokensRegistrationOptions` defined as follows:
 
 ```typescript
-export interface SemanticTokensRegistrationOptions extends TextDocumentRegistrationOptions, SemanticTokensOptions, StaticRegistrationOptions {
+export interface SemanticTokensRegistrationOptions extends
+	TextDocumentRegistrationOptions, SemanticTokensOptions,
+	StaticRegistrationOptions {
 }
 ```
 
-The following sections describe the concrete requests available for semantic tokens.
+Since the registration option handles range, full and delta requests the method used to register for semantic tokens requests is `textDocument/semanticTokens` and not one of the specific methods described below.
 
 **Requesting semantic tokens for a whole file**
 
@@ -6366,7 +7246,8 @@ _Request_:
 * params: `SemanticTokensParams` defined as follows:
 
 ```typescript
-export interface SemanticTokensParams extends WorkDoneProgressParams, PartialResultParams {
+export interface SemanticTokensParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -6391,7 +7272,7 @@ export interface SemanticTokens {
 	/**
 	 * The actual tokens.
 	 */
-	data: number[];
+	data: uinteger[];
 }
 ```
 
@@ -6399,7 +7280,7 @@ export interface SemanticTokens {
 
 ```typescript
 export interface SemanticTokensPartialResult {
-	data: number[];
+	data: uinteger[];
 }
 ```
 
@@ -6413,15 +7294,16 @@ _Request_:
 * params: `SemanticTokensDeltaParams` defined as follows:
 
 ```typescript
-export interface SemanticTokensDeltaParams extends WorkDoneProgressParams, PartialResultParams {
+export interface SemanticTokensDeltaParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The text document.
 	 */
 	textDocument: TextDocumentIdentifier;
 
 	/**
-	 * The result id of a previous response. The result Id can either point to a full response
-	 * or a delta response depending on what was recevied last.
+	 * The result id of a previous response. The result Id can either point to
+	 * a full response or a delta response depending on what was received last.
 	 */
 	previousResultId: string;
 }
@@ -6435,7 +7317,8 @@ _Response_:
 export interface SemanticTokensDelta {
 	readonly resultId?: string;
 	/**
-	 * The semantic token edits to transform a previous result into a new result.
+	 * The semantic token edits to transform a previous result into a new
+	 * result.
 	 */
 	edits: SemanticTokensEdit[];
 }
@@ -6444,17 +7327,17 @@ export interface SemanticTokensEdit {
 	/**
 	 * The start offset of the edit.
 	 */
-	start: number;
+	start: uinteger;
 
 	/**
 	 * The count of elements to remove.
 	 */
-	deleteCount: number;
+	deleteCount: uinteger;
 
 	/**
 	 * The elements to insert.
 	 */
-	data?: number[];
+	data?: uinteger[];
 }
 ```
 
@@ -6470,7 +7353,7 @@ export interface SemanticTokensDeltaPartialResult {
 
 **Requesting semantic tokens for a range**
 
-When a user opens a file it can be benificial to only compute the semantic tokens for the visible range (faster rendering of the tokens in the user interface). If a server can compute these tokens faster than for the whole file it can provide a handler for the `textDocument/semanticTokens/range` request to handle this case special. Please note that if a client also announces that it will send the `textDocument/semanticTokens/range` server should implement this request as well to allow for flicker free scrolling and semantic coloring of a minimap.
+When a user opens a file it can be beneficial to only compute the semantic tokens for the visible range (faster rendering of the tokens in the user interface). If a server can compute these tokens faster than for the whole file it can provide a handler for the `textDocument/semanticTokens/range` request to handle this case special. Please note that if a client also announces that it will send the `textDocument/semanticTokens/range` server should implement this request as well to allow for flicker free scrolling and semantic coloring of a minimap.
 
 _Request_:
 
@@ -6478,7 +7361,8 @@ _Request_:
 * params: `SemanticTokensRangeParams` defined as follows:
 
 ```typescript
-export interface SemanticTokensRangeParams extends WorkDoneProgressParams, PartialResultParams {
+export interface SemanticTokensRangeParams extends WorkDoneProgressParams,
+	PartialResultParams {
 	/**
 	 * The text document.
 	 */
@@ -6497,6 +7381,115 @@ _Response_:
 * partial result: `SemanticTokensPartialResult`
 * error: code and message set in case an exception happens during the 'textDocument/semanticTokens/range' request
 
+**Requesting a refresh of all semantic tokens**
+
+The `workspace/semanticTokens/refresh` request is sent from the server to the client. Servers can use it to ask clients to refresh the editors for which this server provides semantic tokens. As a result the client should ask the server to recompute the semantic tokens for these editors. This is useful if a server detects a project wide configuration change which requires a re-calculation of all semantic tokens. Note that the client still has the freedom to delay the re-calculation of the semantic tokens if for example an editor is currently not visible.
+
+_Client Capability_:
+
+* property name (optional): `workspace.semanticTokens`
+* property type: `SemanticTokensWorkspaceClientCapabilities` defined as follows:
+
+```typescript
+export interface SemanticTokensWorkspaceClientCapabilities {
+	/**
+	 * Whether the client implementation supports a refresh request sent from
+	 * the server to the client.
+	 *
+	 * Note that this event is global and will force the client to refresh all
+	 * semantic tokens currently shown. It should be used with absolute care
+	 * and is useful for situation where a server for example detect a project
+	 * wide change that requires such a calculation.
+	 */
+	refreshSupport?: boolean;
+}
+```
+
+_Request_:
+
+* method: `workspace/semanticTokens/refresh`
+* params: none
+
+_Response_:
+
+* result: void
+* error: code and message set in case an exception happens during the 'workspace/semanticTokens/refresh' request
+
+#### <a href="#textDocument_linkedEditingRange" name="textDocument_linkedEditingRange" class="anchor">Linked Editing Range(:leftwards_arrow_with_hook:)</a>
+
+> *Since version 3.16.0*
+
+The linked editing request is sent from the client to the server to return for a given position in a document the range of the symbol at the position and all ranges that have the same content. Optionally a word pattern can be returned to describe valid contents. A rename to one of the ranges can be applied to all other ranges if the new content is valid. If no result-specific word pattern is provided, the word pattern from the client's language configuration is used.
+
+_Client Capabilities_:
+
+* property name (optional): `textDocument.linkedEditingRange`
+* property type: `LinkedEditingRangeClientCapabilities` defined as follows:
+
+```typescript
+export interface LinkedEditingRangeClientCapabilities {
+	/**
+	 * Whether implementation supports dynamic registration.
+	 * If this is set to `true` the client supports the new
+	 * `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+	 * return value for the corresponding server capability as well.
+	 */
+	dynamicRegistration?: boolean;
+}
+```
+
+_Server Capability_:
+
+* property name (optional): `linkedEditingRangeProvider`
+* property type: `boolean` \| `LinkedEditingRangeOptions` \| `LinkedEditingRangeRegistrationOptions` defined as follows:
+
+```typescript
+export interface LinkedEditingRangeOptions extends WorkDoneProgressOptions {
+}
+```
+
+_Registration Options_: `LinkedEditingRangeRegistrationOptions` defined as follows:
+
+```typescript
+export interface LinkedEditingRangeRegistrationOptions extends
+	TextDocumentRegistrationOptions, LinkedEditingRangeOptions,
+	StaticRegistrationOptions {
+}
+```
+
+_Request_:
+
+* method: `textDocument/linkedEditingRange`
+* params: `LinkedEditingRangeParams` defined as follows:
+
+```typescript
+export interface LinkedEditingRangeParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams {
+}
+```
+
+_Response_:
+
+* result: `LinkedEditingRanges` \| `null` defined as follows:
+
+```typescript
+export interface LinkedEditingRanges {
+	/**
+	 * A list of ranges that can be renamed together. The ranges must have
+	 * identical length and contain identical text content. The ranges cannot overlap.
+	 */
+	ranges: Range[];
+
+	/**
+	 * An optional word pattern (regular expression) that describes valid contents for
+	 * the given ranges. If no pattern is provided, the client configuration's word
+	 * pattern will be used.
+	 */
+	wordPattern?: string;
+}
+```
+* error: code and message set in case an exception happens during the 'textDocument/linkedEditingRange' request
+
 #### <a href="#textDocument_moniker" name="textDocument_moniker" class="anchor">Monikers (:leftwards_arrow_with_hook:)</a>
 
 > *Since version 3.16.0*
@@ -6513,9 +7506,10 @@ _Client Capabilities_:
 ```typescript
 interface MonikerClientCapabilities {
 	/**
-	 * Whether implementation supports dynamic registration. If this is set to `true`
-	 * the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
-	 * return value for the corresponding server capability as well.
+	 * Whether implementation supports dynamic registration. If this is set to
+	 * `true` the client supports the new `(TextDocumentRegistrationOptions &
+	 * StaticRegistrationOptions)` return value for the corresponding server
+	 * capability as well.
 	 */
 	dynamicRegistration?: boolean;
 }
@@ -6534,7 +7528,8 @@ export interface MonikerOptions extends WorkDoneProgressOptions {
 _Registration Options_: `MonikerRegistrationOptions` defined as follows:
 
 ```typescript
-export interface MonikerRegistrationOptions extends TextDocumentRegistrationOptions, MonikerOptions {
+export interface MonikerRegistrationOptions extends
+	TextDocumentRegistrationOptions, MonikerOptions {
 }
 ```
 
@@ -6544,7 +7539,8 @@ _Request_:
 * params: `MonikerParams` defined as follows:
 
 ```typescript
-export interface MonikerParams extends TextDocumentPositionParams, WorkDoneProgressParams, PartialResultParams {
+export interface MonikerParams extends TextDocumentPositionParams,
+	WorkDoneProgressParams, PartialResultParams {
 }
 ```
 
@@ -6552,7 +7548,7 @@ _Response_:
 
 * result: `Moniker[] | null`
 * partial result: `Moniker[]`
-* error: code and message set in case an exception happens during the 'textDocument/semanticTokens/range' request
+* error: code and message set in case an exception happens during the 'textDocument/moniker' request
 
 `Moniker` is defined as follows:
 
@@ -6648,20 +7644,38 @@ Language servers usually run in a separate process and client communicate with t
 - if servers end up in an inconsistent state they should log this to the client using the `window/logMessage` request. If they can't recover from this the best they can do right now is to exit themselves. We are considering an [extension to the protocol](https://github.com/Microsoft/language-server-protocol/issues/646) that allows servers to request a restart on the client side.
 - if a client notices that a server exits unexpectedly, it should try to restart the server. However clients should be careful not to restart a crashing server endlessly. VS Code, for example, doesn't restart a server which has crashed 5 times in the last 180 seconds.
 
+Servers usually support different communication channels (e.g. stdio, pipes, ...). To easy the usage of servers in different clients it is highly recommended that a server implementation supports the following command line arguments to pick the communication channel:
+
+- **stdio**: uses stdio as the communication channel.
+- **pipe**: use pipes (Windows) or socket files (Linux, Mac) as the communication channel. The pipe / socket file name is passed as the next arg or with `--pipe=`.
+- **socket**: uses a socket as the communication channel. The port is passed as next arg or with `--port=`.
+- **node-ipc**: use node IPC communication between the client and the server. This is only support if both client and server run under node.
+
 ### <a href="#changeLog" name="changeLog" class="anchor">Change Log</a>
 
 #### <a href="#version_3_16_0" name="version_3_16_0" class="anchor">3.16.0 (xx/xx/xxxx)</a>
 
-* Add support for tracing
-* Add semantic token support
-* Add call hierarchy support
-* Add client capbility for resolving text edits on completion items.
-* Add support for insert and replace ranges on `CompletionItem`
-* Add support for diagnostic links
-* Add support for tags on `SymbolInformation` and `DocumentSymbol`
+* Add support for tracing.
+* Add semantic token support.
+* Add call hierarchy support.
+* Add client capability for resolving text edits on completion items.
+* Add support for client default behavior on renames.
+* Add support for insert and replace ranges on `CompletionItem`.
+* Add support for diagnostic code descriptions.
+* Add support for document symbol provider label.
+* Add support for tags on `SymbolInformation` and `DocumentSymbol`.
 * Add support for moniker request method.
-* Add support for code action disabled property.
+* Add support for code action `data` property.
+* Add support for code action `disabled` property.
 * Add support for code action resolve request.
+* Add support for diagnostic `data` property.
+* Add support for signature information `activeParameter` property.
+* Add client capability to signal whether the client normalizes line endings.
+* Add support to preserve additional attributes on `MessageActionItem`.
+* Add support to provide the clients locale in the initialize call.
+* Add support for opening and showing a document in the client user interface.
+* Add support for linked editing.
+* Add support for change annotations in text edits as well as in create file, rename file and delete file operations.
 
 #### <a href="#version_3_15_0" name="version_3_15_0" class="anchor">3.15.0 (01/14/2020)</a>
 
diff --git a/css/main.scss b/css/main.scss
index e2d858c4f..257a569a7 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -59,7 +59,7 @@ table.table-responsive.table-bordered {
 			position: -ms-sticky;
 			position: -o-sticky;
 			top: 3rem; // 2.5rem for the header's height + padding,
-			           // +.5rem for the tr's own padding 
+			           // +.5rem for the tr's own padding
 			background: #fff;
 			outline: 1px solid #e9ecef;
 		}
@@ -92,6 +92,7 @@ table.table-responsive.table-bordered {
 }
 
 pre[class=highlight] {
+	tab-size: 4ch;
 	padding: 9.5px;
 	overflow: auto;
 	font-size: 85%;
@@ -450,15 +451,15 @@ pre[class=highlight] {
 
 .nav .nav-link {
 	color: #2753e3 !important;
-  }  
+  }
 
 .nav .nav-link:hover {
 	color: #1034a8 !important;
-}  
+}
 
-a { 
+a {
 	color: #2753e3;
-}  
+}
 
 a:hover {
 	color: #1034a8
diff --git a/inspector/index.html b/inspector/index.html
index db0618fc2..40b647dd2 100644
--- a/inspector/index.html
+++ b/inspector/index.html
@@ -12,8 +12,8 @@
 
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
 
-<!-- MicroSoft cookie library -->
-<script src="https://uhf.microsoft.com/mscc/statics/mscc-0.4.0.min.js"></script>
+<!-- Microsoft EU cookie compliance library -->
+<script src="https://wcpstatic.microsoft.com/mscc/lib/v2/wcp-consent.js"></script>
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-62780441-30"></script>
 
diff --git a/js/page.js b/js/page.js
index 4d56fa2b4..08a5995df 100644
--- a/js/page.js
+++ b/js/page.js
@@ -4,6 +4,12 @@ $('#small-nav-dropdown').change(function() {
     .val()
 })
 
+function onConsentChanged() {
+  console.log(WcpConsent.siteConsent.getConsent());
+
+  // Where we would handle non-essential cookies in the future
+}
+
 $(function() {
   // Load GA upfront because we classify it as essential cookie
   window.dataLayer = window.dataLayer || []
@@ -13,17 +19,14 @@ $(function() {
   gtag('js', new Date())
   gtag('config', 'UA-62780441-30', { anonymize_ip: true })
 
-  if (mscc) {
-    if (!mscc.hasConsent()) {
-      window.addEventListener('click', function() {
-        if (!mscc.hasConsent()) {
-          mscc.setConsent()
-        }
-      })
+  window.WcpConsent && WcpConsent.init("en-US", "cookie-banner", function (err, _siteConsent) {
+    }, onConsentChanged, WcpConsent.themes.light);
 
-      // Where future non-essential tracking cookie need to go
-      mscc.on('consent', function() {
-      })
-    }
+  const cookieManager = document.querySelector('#footer-cookie-link');
+  if (WcpConsent.siteConsent.isConsentRequired && cookieManager && cookieManager.parentElement) {
+    cookieManager.parentElement.style.display = '';
   }
+
+  // initialize consent
+  onConsentChanged();
 })
\ No newline at end of file