X-Git-Url: https://git.josue.xyz/?p=dotfiles%2F.git;a=blobdiff_plain;f=.config%2Fcoc%2Fextensions%2Fnode_modules%2Fcoc-eslint%2Flib%2Findex.js;h=9fed28e114e3501494924c31d7ff4d0a57d6a6fa;hp=5bcbccb7f838cf0f15834b1d2552346874b82814;hb=4d07c77cf4d78cab8639e13ddc3c22495e585b0b;hpb=b3950616b54221c40a7dab9099bda675007e5b6e

diff --git a/.config/coc/extensions/node_modules/coc-eslint/lib/index.js b/.config/coc/extensions/node_modules/coc-eslint/lib/index.js
index 5bcbccb7..9fed28e1 100644
--- a/.config/coc/extensions/node_modules/coc-eslint/lib/index.js
+++ b/.config/coc/extensions/node_modules/coc-eslint/lib/index.js
@@ -90,15 +90,6 @@
 
 "use strict";
 
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -107,7 +98,7 @@ const coc_nvim_1 = __webpack_require__(1);
 const fs_1 = __importDefault(__webpack_require__(2));
 const path_1 = __importDefault(__webpack_require__(3));
 const vscode_languageserver_protocol_1 = __webpack_require__(4);
-const utils_1 = __webpack_require__(31);
+const utils_1 = __webpack_require__(33);
 const defaultLanguages = ['javascript', 'javascriptreact', 'typescript', 'typescriptreact'];
 var Is;
 (function (Is) {
@@ -145,30 +136,28 @@ var NoESLintLibraryRequest;
     NoESLintLibraryRequest.type = new vscode_languageserver_protocol_1.RequestType('eslint/noLibrary');
 })(NoESLintLibraryRequest || (NoESLintLibraryRequest = {}));
 const exitCalled = new vscode_languageserver_protocol_1.NotificationType('eslint/exitCalled');
-function createDefaultConfiguration() {
-    return __awaiter(this, void 0, void 0, function* () {
-        let { root } = coc_nvim_1.workspace;
-        let configFiles = [
-            '.eslintrc.js',
-            '.eslintrc.yaml',
-            '.eslintrc.yml',
-            '.eslintrc',
-            '.eslintrc.json'
-        ];
-        for (let configFile of configFiles) {
-            if (fs_1.default.existsSync(path_1.default.join(root, configFile))) {
-                coc_nvim_1.workspace.openResource(coc_nvim_1.Uri.file(root).toString()).catch(_e => {
-                    // noop
-                });
-                return;
-            }
+async function createDefaultConfiguration() {
+    let { root } = coc_nvim_1.workspace;
+    let configFiles = [
+        '.eslintrc.js',
+        '.eslintrc.yaml',
+        '.eslintrc.yml',
+        '.eslintrc',
+        '.eslintrc.json'
+    ];
+    for (let configFile of configFiles) {
+        if (fs_1.default.existsSync(path_1.default.join(root, configFile))) {
+            coc_nvim_1.workspace.openResource(coc_nvim_1.Uri.file(root).toString()).catch(_e => {
+                // noop
+            });
+            return;
         }
-        const eslintCommand = yield utils_1.findEslint(root);
-        yield coc_nvim_1.workspace.nvim.call('coc#util#open_terminal', [{
-                cmd: eslintCommand + ' --init',
-                cwd: root
-            }]);
-    });
+    }
+    const eslintCommand = await utils_1.findEslint(root);
+    await coc_nvim_1.workspace.nvim.call('coc#util#open_terminal', [{
+            cmd: eslintCommand + ' --init',
+            cwd: root
+        }]);
 }
 function shouldBeValidated(textDocument) {
     let config = coc_nvim_1.workspace.getConfiguration('eslint', textDocument.uri);
@@ -177,173 +166,187 @@ function shouldBeValidated(textDocument) {
     let filetypes = config.get('filetypes', defaultLanguages);
     return filetypes.indexOf(textDocument.languageId) !== -1;
 }
-function activate(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let { subscriptions } = context;
-        const config = coc_nvim_1.workspace.getConfiguration().get('eslint', {});
-        const filetypes = config.filetypes || defaultLanguages;
-        const selector = filetypes.reduce((res, filetype) => {
-            return res.concat([{ language: filetype, scheme: 'file' }, { language: filetype, scheme: 'untitled' }]);
-        }, []);
-        let serverOptions = {
-            module: context.asAbsolutePath('./lib/server.js'),
-            args: ['--node-ipc'],
-            transport: coc_nvim_1.TransportKind.ipc,
-            options: {
-                cwd: coc_nvim_1.workspace.root,
-                execArgv: config.execArgv
-            }
-        };
-        const syncedDocuments = new Map();
-        let clientOptions = {
-            documentSelector: selector,
-            synchronize: {
-                configurationSection: 'eslint',
-                fileEvents: [
-                    coc_nvim_1.workspace.createFileSystemWatcher('**/.eslintr{c.js,c.yaml,c.yml,c,c.json}'),
-                    coc_nvim_1.workspace.createFileSystemWatcher('**/.eslintignore'),
-                    coc_nvim_1.workspace.createFileSystemWatcher('**/package.json')
-                ]
+async function activate(context) {
+    let { subscriptions } = context;
+    const config = coc_nvim_1.workspace.getConfiguration().get('eslint', {});
+    const filetypes = config.filetypes || defaultLanguages;
+    const selector = filetypes.reduce((res, filetype) => {
+        return res.concat([{ language: filetype, scheme: 'file' }, { language: filetype, scheme: 'untitled' }]);
+    }, []);
+    const nodeEnv = config.nodeEnv;
+    let env;
+    if (nodeEnv)
+        env = { nodeEnv };
+    let serverOptions = {
+        runtime: config.runtime,
+        module: context.asAbsolutePath('./lib/server.js'),
+        args: ['--node-ipc'],
+        transport: coc_nvim_1.TransportKind.ipc,
+        options: {
+            cwd: coc_nvim_1.workspace.root,
+            execArgv: config.execArgv,
+            env
+        }
+    };
+    const syncedDocuments = new Map();
+    let clientOptions = {
+        documentSelector: selector,
+        synchronize: {
+            configurationSection: 'eslint',
+            fileEvents: [
+                coc_nvim_1.workspace.createFileSystemWatcher('**/.eslintr{c.js,c.yaml,c.yml,c,c.json}'),
+                coc_nvim_1.workspace.createFileSystemWatcher('**/.eslintignore'),
+                coc_nvim_1.workspace.createFileSystemWatcher('**/package.json')
+            ]
+        },
+        outputChannelName: 'eslint',
+        initializationOptions: config.initializationOptions,
+        diagnosticCollectionName: 'eslint',
+        initializationFailedHandler: error => {
+            coc_nvim_1.workspace.showMessage(`Eslint server initialization failed: ${error.message}.`, 'error');
+            return false;
+        },
+        middleware: {
+            didOpen: (document, next) => {
+                if (shouldBeValidated(document)) {
+                    next(document);
+                    syncedDocuments.set(document.uri.toString(), document);
+                    return;
+                }
             },
-            outputChannelName: 'eslint',
-            initializationOptions: config.initializationOptions,
-            diagnosticCollectionName: 'eslint',
-            initializationFailedHandler: error => {
-                coc_nvim_1.workspace.showMessage(`Eslint server initialization failed: ${error.message}.`, 'error');
-                return false;
+            didChange: (event, next) => {
+                if (syncedDocuments.has(event.textDocument.uri)) {
+                    next(event);
+                }
             },
-            middleware: {
-                didOpen: (document, next) => {
-                    if (shouldBeValidated(document)) {
-                        next(document);
-                        syncedDocuments.set(document.uri.toString(), document);
-                        return;
-                    }
-                },
-                didChange: (event, next) => {
-                    if (syncedDocuments.has(event.textDocument.uri)) {
-                        next(event);
-                    }
-                },
-                didClose: (document, next) => {
-                    let uri = document.uri.toString();
-                    if (syncedDocuments.has(uri)) {
-                        syncedDocuments.delete(uri);
-                        next(document);
-                    }
-                },
-                provideCodeActions: (document, range, context, token, next) => {
-                    if (!syncedDocuments.has(document.uri.toString()) || !context.diagnostics || context.diagnostics.length === 0) {
-                        return [];
-                    }
-                    let eslintDiagnostics = [];
-                    for (let diagnostic of context.diagnostics) {
-                        if (diagnostic.source === 'eslint') {
-                            eslintDiagnostics.push(diagnostic);
-                        }
-                    }
-                    if (eslintDiagnostics.length === 0) {
-                        return [];
-                    }
-                    let newContext = Object.assign({}, context, {
-                        diagnostics: eslintDiagnostics
-                    });
-                    return next(document, range, newContext, token);
-                },
-                workspace: {
-                    configuration: (params, _token, _next) => {
-                        return params.items.map(item => {
-                            let uri = item.scopeUri;
-                            let config = coc_nvim_1.workspace.getConfiguration('eslint', uri);
-                            let pm = config.get('packageManager', 'npm');
-                            let settings = {
-                                packageManager: pm === 'yarn' ? 'yarn' : 'npm',
-                                quiet: config.get('quiet', false),
-                                validate: config.get('validate', true),
-                                autoFix: config.get('autoFix', false),
-                                autoFixOnSave: config.get('autoFixOnSave', false),
-                                nodePath: config.get('nodePath', undefined),
-                                options: config.get('options', {}),
-                                run: config.get('run', 'onType'),
-                                workspaceFolder: getWorkspaceFolder(uri),
-                                workingDirectory: undefined,
-                                codeAction: {
-                                    disableRuleComment: config.get('codeAction.disableRuleComment', { enable: true, location: 'separateLine' }),
-                                    showDocumentation: config.get('codeAction.showDocumentation', { enable: true })
-                                }
-                            };
-                            return settings;
-                        });
+            didClose: (document, next) => {
+                let uri = document.uri.toString();
+                if (syncedDocuments.has(uri)) {
+                    syncedDocuments.delete(uri);
+                    next(document);
+                }
+            },
+            provideCodeActions: (document, range, context, token, next) => {
+                if (!syncedDocuments.has(document.uri.toString()) || !context.diagnostics || context.diagnostics.length === 0) {
+                    return [];
+                }
+                let eslintDiagnostics = [];
+                for (let diagnostic of context.diagnostics) {
+                    if (diagnostic.source === 'eslint') {
+                        eslintDiagnostics.push(diagnostic);
                     }
                 }
-            }
-        };
-        let client = new coc_nvim_1.LanguageClient('eslint', 'eslint langserver', serverOptions, clientOptions);
-        subscriptions.push(coc_nvim_1.services.registLanguageClient(client));
-        function onDidChangeConfiguration(e) {
-            if (!e.affectsConfiguration('eslint'))
-                return;
-            if (client.serviceState != coc_nvim_1.ServiceStat.Running)
-                return;
-            for (let textDocument of syncedDocuments.values()) {
-                if (!shouldBeValidated(textDocument)) {
-                    syncedDocuments.delete(textDocument.uri);
-                    client.sendNotification(vscode_languageserver_protocol_1.DidCloseTextDocumentNotification.type, { textDocument: { uri: textDocument.uri } });
+                if (eslintDiagnostics.length === 0) {
+                    return [];
                 }
-            }
-            for (let textDocument of coc_nvim_1.workspace.textDocuments) {
-                if (!syncedDocuments.has(textDocument.uri.toString()) && shouldBeValidated(textDocument)) {
-                    client.sendNotification(vscode_languageserver_protocol_1.DidOpenTextDocumentNotification.type, {
-                        textDocument: {
-                            uri: textDocument.uri,
-                            languageId: textDocument.languageId,
-                            version: textDocument.version,
-                            text: textDocument.getText()
-                        }
+                let newContext = Object.assign({}, context, {
+                    diagnostics: eslintDiagnostics
+                });
+                return next(document, range, newContext, token);
+            },
+            workspace: {
+                configuration: (params, _token, _next) => {
+                    return params.items.map(item => {
+                        let uri = item.scopeUri;
+                        let config = coc_nvim_1.workspace.getConfiguration('eslint', uri);
+                        let pm = config.get('packageManager', 'npm');
+                        let settings = {
+                            packageManager: pm === 'yarn' ? 'yarn' : 'npm',
+                            quiet: config.get('quiet', false),
+                            validate: config.get('validate', true),
+                            autoFix: config.get('autoFix', false),
+                            autoFixOnSave: config.get('autoFixOnSave', false),
+                            autoFixSkipRules: config.get('autoFixSkipRules', []),
+                            nodePath: config.get('nodePath', undefined),
+                            options: config.get('options', {}),
+                            run: config.get('run', 'onType'),
+                            workspaceFolder: getWorkspaceFolder(uri),
+                            workingDirectory: undefined,
+                            codeAction: {
+                                disableRuleComment: config.get('codeAction.disableRuleComment', { enable: true, location: 'separateLine' }),
+                                showDocumentation: config.get('codeAction.showDocumentation', { enable: true })
+                            }
+                        };
+                        return settings;
                     });
-                    syncedDocuments.set(textDocument.uri.toString(), textDocument);
                 }
             }
         }
-        subscriptions.push(coc_nvim_1.commands.registerCommand('eslint.createConfig', createDefaultConfiguration));
-        subscriptions.push(coc_nvim_1.commands.registerCommand('eslint.executeAutofix', () => __awaiter(this, void 0, void 0, function* () {
-            let document = yield coc_nvim_1.workspace.document;
-            let textDocument = {
-                uri: document.uri,
-                version: document.version
-            };
-            let params = {
-                command: 'eslint.applyAutoFix',
-                arguments: [textDocument]
-            };
-            client.sendRequest(vscode_languageserver_protocol_1.ExecuteCommandRequest.type, params)
-                .then(undefined, () => {
-                coc_nvim_1.workspace.showMessage('Failed to apply ESLint fixes to the document.', 'error');
-            });
-        })));
-        client.onReady().then(() => {
-            client.onNotification(exitCalled, params => {
-                coc_nvim_1.workspace.showMessage(`Server process exited with code ${params[0]}. This usually indicates a misconfigured ESLint setup.`, 'error');
-            });
-            client.onRequest(NoConfigRequest.type, params => {
-                let document = coc_nvim_1.Uri.parse(params.document.uri);
-                let fileLocation = document.fsPath;
-                coc_nvim_1.workspace.showMessage(`No ESLint configuration (e.g .eslintrc) found for file: ${fileLocation}`, 'warning');
-                return {};
-            });
-            client.onRequest(NoESLintLibraryRequest.type, params => {
-                let uri = coc_nvim_1.Uri.parse(params.source.uri);
-                coc_nvim_1.workspace.showMessage(`Failed to load the ESLint library for the document ${uri.fsPath}`, 'warning');
-                return {};
-            });
-            client.onRequest(OpenESLintDocRequest.type, (params) => __awaiter(this, void 0, void 0, function* () {
-                yield coc_nvim_1.commands.executeCommand('vscode.open', coc_nvim_1.Uri.parse(params.url));
-                return {};
-            }));
-            coc_nvim_1.workspace.onDidChangeConfiguration(onDidChangeConfiguration, null, subscriptions);
-        }, _e => {
-            // noop
+    };
+    let client = new coc_nvim_1.LanguageClient('eslint', 'eslint langserver', serverOptions, clientOptions);
+    subscriptions.push(coc_nvim_1.services.registLanguageClient(client));
+    function onDidChangeConfiguration(e) {
+        if (!e.affectsConfiguration('eslint') || client.serviceState != coc_nvim_1.ServiceStat.Running)
+            return;
+        for (let textDocument of syncedDocuments.values()) {
+            if (!shouldBeValidated(textDocument)) {
+                syncedDocuments.delete(textDocument.uri);
+                client.sendNotification(vscode_languageserver_protocol_1.DidCloseTextDocumentNotification.type, { textDocument: { uri: textDocument.uri } });
+            }
+        }
+        for (let textDocument of coc_nvim_1.workspace.textDocuments) {
+            if (!syncedDocuments.has(textDocument.uri.toString()) && shouldBeValidated(textDocument)) {
+                client.sendNotification(vscode_languageserver_protocol_1.DidOpenTextDocumentNotification.type, {
+                    textDocument: {
+                        uri: textDocument.uri,
+                        languageId: textDocument.languageId,
+                        version: textDocument.version,
+                        text: textDocument.getText()
+                    }
+                });
+                syncedDocuments.set(textDocument.uri.toString(), textDocument);
+            }
+        }
+    }
+    subscriptions.push(coc_nvim_1.commands.registerCommand('eslint.createConfig', createDefaultConfiguration));
+    subscriptions.push(coc_nvim_1.commands.registerCommand('eslint.executeAutofix', async () => {
+        let document = await coc_nvim_1.workspace.document;
+        if (!shouldBeValidated(document.textDocument)) {
+            coc_nvim_1.workspace.showMessage(`Current filetype ${document.textDocument.languageId} is not handled by coc-eslint.`, 'warning');
+            return;
+        }
+        await client.onReady();
+        let textDocument = {
+            uri: document.uri,
+            version: document.version
+        };
+        let params = {
+            command: 'eslint.applyAutoFix',
+            arguments: [textDocument]
+        };
+        client.sendRequest(vscode_languageserver_protocol_1.ExecuteCommandRequest.type, params)
+            .then(undefined, () => {
+            coc_nvim_1.workspace.showMessage('Failed to apply ESLint fixes to the document.', 'error');
+        });
+    }));
+    client.onReady().then(() => {
+        client.onNotification(exitCalled, params => {
+            coc_nvim_1.workspace.showMessage(`Server process exited with code ${params[0]}. This usually indicates a misconfigured ESLint setup.`, 'error');
         });
+        client.onRequest(NoConfigRequest.type, params => {
+            let uri = coc_nvim_1.Uri.parse(params.document.uri);
+            let config = coc_nvim_1.workspace.getConfiguration('eslint', uri.toString());
+            if (config.get('quiet', false))
+                return;
+            let fileLocation = uri.fsPath;
+            coc_nvim_1.workspace.showMessage(`No ESLint configuration (e.g .eslintrc) found for file: ${fileLocation}`, 'warning');
+            return {};
+        });
+        client.onRequest(NoESLintLibraryRequest.type, params => {
+            let uri = coc_nvim_1.Uri.parse(params.source.uri);
+            let config = coc_nvim_1.workspace.getConfiguration('eslint', uri.toString());
+            if (config.get('quiet', false))
+                return;
+            coc_nvim_1.workspace.showMessage(`Failed to load the ESLint library for the document ${uri.fsPath}`, 'warning');
+            return {};
+        });
+        client.onRequest(OpenESLintDocRequest.type, async (params) => {
+            await coc_nvim_1.commands.executeCommand('vscode.open', coc_nvim_1.Uri.parse(params.url));
+            return {};
+        });
+        coc_nvim_1.workspace.onDidChangeConfiguration(onDidChangeConfiguration, null, subscriptions);
+    }, _e => {
+        // noop
     });
 }
 exports.activate = activate;
@@ -417,7 +420,8 @@ exports.createServerSocketTransport = vscode_jsonrpc_1.createServerSocketTranspo
 exports.ProgressType = vscode_jsonrpc_1.ProgressType;
 __export(__webpack_require__(18));
 __export(__webpack_require__(19));
-const callHierarchy = __webpack_require__(30);
+const callHierarchy = __webpack_require__(31);
+const st = __webpack_require__(32);
 var Proposed;
 (function (Proposed) {
     let CallHierarchyPrepareRequest;
@@ -428,15 +432,31 @@ var Proposed;
     let CallHierarchyIncomingCallsRequest;
     (function (CallHierarchyIncomingCallsRequest) {
         CallHierarchyIncomingCallsRequest.method = callHierarchy.CallHierarchyIncomingCallsRequest.method;
-        CallHierarchyIncomingCallsRequest.type = callHierarchy.CallHierarchyIncomingCallsRequest;
-        CallHierarchyIncomingCallsRequest.resultType = callHierarchy.CallHierarchyIncomingCallsRequest.resultType;
+        CallHierarchyIncomingCallsRequest.type = callHierarchy.CallHierarchyIncomingCallsRequest.type;
     })(CallHierarchyIncomingCallsRequest = Proposed.CallHierarchyIncomingCallsRequest || (Proposed.CallHierarchyIncomingCallsRequest = {}));
     let CallHierarchyOutgoingCallsRequest;
     (function (CallHierarchyOutgoingCallsRequest) {
         CallHierarchyOutgoingCallsRequest.method = callHierarchy.CallHierarchyOutgoingCallsRequest.method;
-        CallHierarchyOutgoingCallsRequest.type = callHierarchy.CallHierarchyOutgoingCallsRequest;
-        CallHierarchyOutgoingCallsRequest.resultType = callHierarchy.CallHierarchyOutgoingCallsRequest.resultType;
+        CallHierarchyOutgoingCallsRequest.type = callHierarchy.CallHierarchyOutgoingCallsRequest.type;
     })(CallHierarchyOutgoingCallsRequest = Proposed.CallHierarchyOutgoingCallsRequest || (Proposed.CallHierarchyOutgoingCallsRequest = {}));
+    Proposed.SemanticTokenTypes = st.SemanticTokenTypes;
+    Proposed.SemanticTokenModifiers = st.SemanticTokenModifiers;
+    Proposed.SemanticTokens = st.SemanticTokens;
+    let SemanticTokensRequest;
+    (function (SemanticTokensRequest) {
+        SemanticTokensRequest.method = st.SemanticTokensRequest.method;
+        SemanticTokensRequest.type = st.SemanticTokensRequest.type;
+    })(SemanticTokensRequest = Proposed.SemanticTokensRequest || (Proposed.SemanticTokensRequest = {}));
+    let SemanticTokensEditsRequest;
+    (function (SemanticTokensEditsRequest) {
+        SemanticTokensEditsRequest.method = st.SemanticTokensEditsRequest.method;
+        SemanticTokensEditsRequest.type = st.SemanticTokensEditsRequest.type;
+    })(SemanticTokensEditsRequest = Proposed.SemanticTokensEditsRequest || (Proposed.SemanticTokensEditsRequest = {}));
+    let SemanticTokensRangeRequest;
+    (function (SemanticTokensRangeRequest) {
+        SemanticTokensRangeRequest.method = st.SemanticTokensRangeRequest.method;
+        SemanticTokensRangeRequest.type = st.SemanticTokensRangeRequest.type;
+    })(SemanticTokensRangeRequest = Proposed.SemanticTokensRangeRequest || (Proposed.SemanticTokensRangeRequest = {}));
 })(Proposed = exports.Proposed || (exports.Proposed = {}));
 function createProtocolConnection(reader, writer, logger, strategy) {
     return vscode_jsonrpc_1.createMessageConnection(reader, writer, logger, strategy);
@@ -515,7 +535,6 @@ var ProgressNotification;
 })(ProgressNotification || (ProgressNotification = {}));
 class ProgressType {
     constructor() {
-        this._ = undefined;
     }
 }
 exports.ProgressType = ProgressType;
@@ -1526,84 +1545,82 @@ class AbstractMessageType {
 exports.AbstractMessageType = AbstractMessageType;
 /**
  * Classes to type request response pairs
+ *
+ * The type parameter RO will be removed in the next major version
+ * of the JSON RPC library since it is a LSP concept and doesn't
+ * belong here. For now it is tagged as default never.
  */
 class RequestType0 extends AbstractMessageType {
     constructor(method) {
         super(method, 0);
-        this._ = undefined;
     }
 }
 exports.RequestType0 = RequestType0;
 class RequestType extends AbstractMessageType {
     constructor(method) {
         super(method, 1);
-        this._ = undefined;
     }
 }
 exports.RequestType = RequestType;
 class RequestType1 extends AbstractMessageType {
     constructor(method) {
         super(method, 1);
-        this._ = undefined;
     }
 }
 exports.RequestType1 = RequestType1;
 class RequestType2 extends AbstractMessageType {
     constructor(method) {
         super(method, 2);
-        this._ = undefined;
     }
 }
 exports.RequestType2 = RequestType2;
 class RequestType3 extends AbstractMessageType {
     constructor(method) {
         super(method, 3);
-        this._ = undefined;
     }
 }
 exports.RequestType3 = RequestType3;
 class RequestType4 extends AbstractMessageType {
     constructor(method) {
         super(method, 4);
-        this._ = undefined;
     }
 }
 exports.RequestType4 = RequestType4;
 class RequestType5 extends AbstractMessageType {
     constructor(method) {
         super(method, 5);
-        this._ = undefined;
     }
 }
 exports.RequestType5 = RequestType5;
 class RequestType6 extends AbstractMessageType {
     constructor(method) {
         super(method, 6);
-        this._ = undefined;
     }
 }
 exports.RequestType6 = RequestType6;
 class RequestType7 extends AbstractMessageType {
     constructor(method) {
         super(method, 7);
-        this._ = undefined;
     }
 }
 exports.RequestType7 = RequestType7;
 class RequestType8 extends AbstractMessageType {
     constructor(method) {
         super(method, 8);
-        this._ = undefined;
     }
 }
 exports.RequestType8 = RequestType8;
 class RequestType9 extends AbstractMessageType {
     constructor(method) {
         super(method, 9);
-        this._ = undefined;
     }
 }
 exports.RequestType9 = RequestType9;
+/**
+ * The type parameter RO will be removed in the next major version
+ * of the JSON RPC library since it is a LSP concept and doesn't
+ * belong here. For now it is tagged as default never.
+ */
 class NotificationType extends AbstractMessageType {
     constructor(method) {
         super(method, 1);
@@ -1614,70 +1631,60 @@ exports.NotificationType = NotificationType;
 class NotificationType0 extends AbstractMessageType {
     constructor(method) {
         super(method, 0);
-        this._ = undefined;
     }
 }
 exports.NotificationType0 = NotificationType0;
 class NotificationType1 extends AbstractMessageType {
     constructor(method) {
         super(method, 1);
-        this._ = undefined;
     }
 }
 exports.NotificationType1 = NotificationType1;
 class NotificationType2 extends AbstractMessageType {
     constructor(method) {
         super(method, 2);
-        this._ = undefined;
     }
 }
 exports.NotificationType2 = NotificationType2;
 class NotificationType3 extends AbstractMessageType {
     constructor(method) {
         super(method, 3);
-        this._ = undefined;
     }
 }
 exports.NotificationType3 = NotificationType3;
 class NotificationType4 extends AbstractMessageType {
     constructor(method) {
         super(method, 4);
-        this._ = undefined;
     }
 }
 exports.NotificationType4 = NotificationType4;
 class NotificationType5 extends AbstractMessageType {
     constructor(method) {
         super(method, 5);
-        this._ = undefined;
     }
 }
 exports.NotificationType5 = NotificationType5;
 class NotificationType6 extends AbstractMessageType {
     constructor(method) {
         super(method, 6);
-        this._ = undefined;
     }
 }
 exports.NotificationType6 = NotificationType6;
 class NotificationType7 extends AbstractMessageType {
     constructor(method) {
         super(method, 7);
-        this._ = undefined;
     }
 }
 exports.NotificationType7 = NotificationType7;
 class NotificationType8 extends AbstractMessageType {
     constructor(method) {
         super(method, 8);
-        this._ = undefined;
     }
 }
 exports.NotificationType8 = NotificationType8;
 class NotificationType9 extends AbstractMessageType {
     constructor(method) {
         super(method, 9);
-        this._ = undefined;
     }
 }
 exports.NotificationType9 = NotificationType9;
@@ -4390,25 +4397,26 @@ var Is;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Is = __webpack_require__(20);
 const vscode_jsonrpc_1 = __webpack_require__(5);
-const protocol_implementation_1 = __webpack_require__(21);
+const messages_1 = __webpack_require__(21);
+const protocol_implementation_1 = __webpack_require__(22);
 exports.ImplementationRequest = protocol_implementation_1.ImplementationRequest;
-const protocol_typeDefinition_1 = __webpack_require__(22);
+const protocol_typeDefinition_1 = __webpack_require__(23);
 exports.TypeDefinitionRequest = protocol_typeDefinition_1.TypeDefinitionRequest;
-const protocol_workspaceFolders_1 = __webpack_require__(23);
+const protocol_workspaceFolders_1 = __webpack_require__(24);
 exports.WorkspaceFoldersRequest = protocol_workspaceFolders_1.WorkspaceFoldersRequest;
 exports.DidChangeWorkspaceFoldersNotification = protocol_workspaceFolders_1.DidChangeWorkspaceFoldersNotification;
-const protocol_configuration_1 = __webpack_require__(24);
+const protocol_configuration_1 = __webpack_require__(25);
 exports.ConfigurationRequest = protocol_configuration_1.ConfigurationRequest;
-const protocol_colorProvider_1 = __webpack_require__(25);
+const protocol_colorProvider_1 = __webpack_require__(26);
 exports.DocumentColorRequest = protocol_colorProvider_1.DocumentColorRequest;
 exports.ColorPresentationRequest = protocol_colorProvider_1.ColorPresentationRequest;
-const protocol_foldingRange_1 = __webpack_require__(26);
+const protocol_foldingRange_1 = __webpack_require__(27);
 exports.FoldingRangeRequest = protocol_foldingRange_1.FoldingRangeRequest;
-const protocol_declaration_1 = __webpack_require__(27);
+const protocol_declaration_1 = __webpack_require__(28);
 exports.DeclarationRequest = protocol_declaration_1.DeclarationRequest;
-const protocol_selectionRange_1 = __webpack_require__(28);
+const protocol_selectionRange_1 = __webpack_require__(29);
 exports.SelectionRangeRequest = protocol_selectionRange_1.SelectionRangeRequest;
-const protocol_progress_1 = __webpack_require__(29);
+const protocol_progress_1 = __webpack_require__(30);
 exports.WorkDoneProgress = protocol_progress_1.WorkDoneProgress;
 exports.WorkDoneProgressCreateRequest = protocol_progress_1.WorkDoneProgressCreateRequest;
 exports.WorkDoneProgressCancelNotification = protocol_progress_1.WorkDoneProgressCancelNotification;
@@ -4451,7 +4459,7 @@ var DocumentSelector;
  */
 var RegistrationRequest;
 (function (RegistrationRequest) {
-    RegistrationRequest.type = new vscode_jsonrpc_1.RequestType('client/registerCapability');
+    RegistrationRequest.type = new messages_1.ProtocolRequestType('client/registerCapability');
 })(RegistrationRequest = exports.RegistrationRequest || (exports.RegistrationRequest = {}));
 /**
  * The `client/unregisterCapability` request is sent from the server to the client to unregister a previously registered capability
@@ -4459,7 +4467,7 @@ var RegistrationRequest;
  */
 var UnregistrationRequest;
 (function (UnregistrationRequest) {
-    UnregistrationRequest.type = new vscode_jsonrpc_1.RequestType('client/unregisterCapability');
+    UnregistrationRequest.type = new messages_1.ProtocolRequestType('client/unregisterCapability');
 })(UnregistrationRequest = exports.UnregistrationRequest || (exports.UnregistrationRequest = {}));
 var ResourceOperationKind;
 (function (ResourceOperationKind) {
@@ -4496,7 +4504,7 @@ var FailureHandlingKind;
     FailureHandlingKind.TextOnlyTransactional = 'textOnlyTransactional';
     /**
      * The client tries to undo the operations already executed. But there is no
-     * guaruntee that this is succeeding.
+     * guarantee that this is succeeding.
      */
     FailureHandlingKind.Undo = 'undo';
 })(FailureHandlingKind = exports.FailureHandlingKind || (exports.FailureHandlingKind = {}));
@@ -4550,7 +4558,7 @@ var WorkDoneProgressOptions;
  */
 var InitializeRequest;
 (function (InitializeRequest) {
-    InitializeRequest.type = new vscode_jsonrpc_1.RequestType('initialize');
+    InitializeRequest.type = new messages_1.ProtocolRequestType('initialize');
 })(InitializeRequest = exports.InitializeRequest || (exports.InitializeRequest = {}));
 /**
  * Known error codes for an `InitializeError`;
@@ -4571,7 +4579,7 @@ var InitializeError;
  */
 var InitializedNotification;
 (function (InitializedNotification) {
-    InitializedNotification.type = new vscode_jsonrpc_1.NotificationType('initialized');
+    InitializedNotification.type = new messages_1.ProtocolNotificationType('initialized');
 })(InitializedNotification = exports.InitializedNotification || (exports.InitializedNotification = {}));
 //---- Shutdown Method ----
 /**
@@ -4582,7 +4590,7 @@ var InitializedNotification;
  */
 var ShutdownRequest;
 (function (ShutdownRequest) {
-    ShutdownRequest.type = new vscode_jsonrpc_1.RequestType0('shutdown');
+    ShutdownRequest.type = new messages_1.ProtocolRequestType0('shutdown');
 })(ShutdownRequest = exports.ShutdownRequest || (exports.ShutdownRequest = {}));
 //---- Exit Notification ----
 /**
@@ -4591,7 +4599,7 @@ var ShutdownRequest;
  */
 var ExitNotification;
 (function (ExitNotification) {
-    ExitNotification.type = new vscode_jsonrpc_1.NotificationType0('exit');
+    ExitNotification.type = new messages_1.ProtocolNotificationType0('exit');
 })(ExitNotification = exports.ExitNotification || (exports.ExitNotification = {}));
 /**
  * The configuration change notification is sent from the client to the server
@@ -4600,7 +4608,7 @@ var ExitNotification;
  */
 var DidChangeConfigurationNotification;
 (function (DidChangeConfigurationNotification) {
-    DidChangeConfigurationNotification.type = new vscode_jsonrpc_1.NotificationType('workspace/didChangeConfiguration');
+    DidChangeConfigurationNotification.type = new messages_1.ProtocolNotificationType('workspace/didChangeConfiguration');
 })(DidChangeConfigurationNotification = exports.DidChangeConfigurationNotification || (exports.DidChangeConfigurationNotification = {}));
 //---- Message show and log notifications ----
 /**
@@ -4631,7 +4639,7 @@ var MessageType;
  */
 var ShowMessageNotification;
 (function (ShowMessageNotification) {
-    ShowMessageNotification.type = new vscode_jsonrpc_1.NotificationType('window/showMessage');
+    ShowMessageNotification.type = new messages_1.ProtocolNotificationType('window/showMessage');
 })(ShowMessageNotification = exports.ShowMessageNotification || (exports.ShowMessageNotification = {}));
 /**
  * The show message request is sent from the server to the client to show a message
@@ -4639,7 +4647,7 @@ var ShowMessageNotification;
  */
 var ShowMessageRequest;
 (function (ShowMessageRequest) {
-    ShowMessageRequest.type = new vscode_jsonrpc_1.RequestType('window/showMessageRequest');
+    ShowMessageRequest.type = new messages_1.ProtocolRequestType('window/showMessageRequest');
 })(ShowMessageRequest = exports.ShowMessageRequest || (exports.ShowMessageRequest = {}));
 /**
  * The log message notification is sent from the server to the client to ask
@@ -4647,7 +4655,7 @@ var ShowMessageRequest;
  */
 var LogMessageNotification;
 (function (LogMessageNotification) {
-    LogMessageNotification.type = new vscode_jsonrpc_1.NotificationType('window/logMessage');
+    LogMessageNotification.type = new messages_1.ProtocolNotificationType('window/logMessage');
 })(LogMessageNotification = exports.LogMessageNotification || (exports.LogMessageNotification = {}));
 //---- Telemetry notification
 /**
@@ -4656,7 +4664,7 @@ var LogMessageNotification;
  */
 var TelemetryEventNotification;
 (function (TelemetryEventNotification) {
-    TelemetryEventNotification.type = new vscode_jsonrpc_1.NotificationType('telemetry/event');
+    TelemetryEventNotification.type = new messages_1.ProtocolNotificationType('telemetry/event');
 })(TelemetryEventNotification = exports.TelemetryEventNotification || (exports.TelemetryEventNotification = {}));
 /**
  * Defines how the host (editor) should sync
@@ -4693,7 +4701,7 @@ var TextDocumentSyncKind;
 var DidOpenTextDocumentNotification;
 (function (DidOpenTextDocumentNotification) {
     DidOpenTextDocumentNotification.method = 'textDocument/didOpen';
-    DidOpenTextDocumentNotification.type = new vscode_jsonrpc_1.NotificationType(DidOpenTextDocumentNotification.method);
+    DidOpenTextDocumentNotification.type = new messages_1.ProtocolNotificationType(DidOpenTextDocumentNotification.method);
 })(DidOpenTextDocumentNotification = exports.DidOpenTextDocumentNotification || (exports.DidOpenTextDocumentNotification = {}));
 /**
  * The document change notification is sent from the client to the server to signal
@@ -4702,7 +4710,7 @@ var DidOpenTextDocumentNotification;
 var DidChangeTextDocumentNotification;
 (function (DidChangeTextDocumentNotification) {
     DidChangeTextDocumentNotification.method = 'textDocument/didChange';
-    DidChangeTextDocumentNotification.type = new vscode_jsonrpc_1.NotificationType(DidChangeTextDocumentNotification.method);
+    DidChangeTextDocumentNotification.type = new messages_1.ProtocolNotificationType(DidChangeTextDocumentNotification.method);
 })(DidChangeTextDocumentNotification = exports.DidChangeTextDocumentNotification || (exports.DidChangeTextDocumentNotification = {}));
 /**
  * The document close notification is sent from the client to the server when
@@ -4716,7 +4724,7 @@ var DidChangeTextDocumentNotification;
 var DidCloseTextDocumentNotification;
 (function (DidCloseTextDocumentNotification) {
     DidCloseTextDocumentNotification.method = 'textDocument/didClose';
-    DidCloseTextDocumentNotification.type = new vscode_jsonrpc_1.NotificationType(DidCloseTextDocumentNotification.method);
+    DidCloseTextDocumentNotification.type = new messages_1.ProtocolNotificationType(DidCloseTextDocumentNotification.method);
 })(DidCloseTextDocumentNotification = exports.DidCloseTextDocumentNotification || (exports.DidCloseTextDocumentNotification = {}));
 /**
  * The document save notification is sent from the client to the server when
@@ -4725,7 +4733,7 @@ var DidCloseTextDocumentNotification;
 var DidSaveTextDocumentNotification;
 (function (DidSaveTextDocumentNotification) {
     DidSaveTextDocumentNotification.method = 'textDocument/didSave';
-    DidSaveTextDocumentNotification.type = new vscode_jsonrpc_1.NotificationType(DidSaveTextDocumentNotification.method);
+    DidSaveTextDocumentNotification.type = new messages_1.ProtocolNotificationType(DidSaveTextDocumentNotification.method);
 })(DidSaveTextDocumentNotification = exports.DidSaveTextDocumentNotification || (exports.DidSaveTextDocumentNotification = {}));
 /**
  * Represents reasons why a text document is saved.
@@ -4753,7 +4761,7 @@ var TextDocumentSaveReason;
 var WillSaveTextDocumentNotification;
 (function (WillSaveTextDocumentNotification) {
     WillSaveTextDocumentNotification.method = 'textDocument/willSave';
-    WillSaveTextDocumentNotification.type = new vscode_jsonrpc_1.NotificationType(WillSaveTextDocumentNotification.method);
+    WillSaveTextDocumentNotification.type = new messages_1.ProtocolNotificationType(WillSaveTextDocumentNotification.method);
 })(WillSaveTextDocumentNotification = exports.WillSaveTextDocumentNotification || (exports.WillSaveTextDocumentNotification = {}));
 /**
  * A document will save request is sent from the client to the server before
@@ -4766,7 +4774,7 @@ var WillSaveTextDocumentNotification;
 var WillSaveTextDocumentWaitUntilRequest;
 (function (WillSaveTextDocumentWaitUntilRequest) {
     WillSaveTextDocumentWaitUntilRequest.method = 'textDocument/willSaveWaitUntil';
-    WillSaveTextDocumentWaitUntilRequest.type = new vscode_jsonrpc_1.RequestType(WillSaveTextDocumentWaitUntilRequest.method);
+    WillSaveTextDocumentWaitUntilRequest.type = new messages_1.ProtocolRequestType(WillSaveTextDocumentWaitUntilRequest.method);
 })(WillSaveTextDocumentWaitUntilRequest = exports.WillSaveTextDocumentWaitUntilRequest || (exports.WillSaveTextDocumentWaitUntilRequest = {}));
 /**
  * The watched files notification is sent from the client to the server when
@@ -4774,7 +4782,7 @@ var WillSaveTextDocumentWaitUntilRequest;
  */
 var DidChangeWatchedFilesNotification;
 (function (DidChangeWatchedFilesNotification) {
-    DidChangeWatchedFilesNotification.type = new vscode_jsonrpc_1.NotificationType('workspace/didChangeWatchedFiles');
+    DidChangeWatchedFilesNotification.type = new messages_1.ProtocolNotificationType('workspace/didChangeWatchedFiles');
 })(DidChangeWatchedFilesNotification = exports.DidChangeWatchedFilesNotification || (exports.DidChangeWatchedFilesNotification = {}));
 /**
  * The file event type
@@ -4815,7 +4823,7 @@ var WatchKind;
  */
 var PublishDiagnosticsNotification;
 (function (PublishDiagnosticsNotification) {
-    PublishDiagnosticsNotification.type = new vscode_jsonrpc_1.NotificationType('textDocument/publishDiagnostics');
+    PublishDiagnosticsNotification.type = new messages_1.ProtocolNotificationType('textDocument/publishDiagnostics');
 })(PublishDiagnosticsNotification = exports.PublishDiagnosticsNotification || (exports.PublishDiagnosticsNotification = {}));
 /**
  * How a completion was triggered
@@ -4851,7 +4859,8 @@ var CompletionTriggerKind;
 var CompletionRequest;
 (function (CompletionRequest) {
     CompletionRequest.method = 'textDocument/completion';
-    CompletionRequest.type = new vscode_jsonrpc_1.RequestType(CompletionRequest.method);
+    CompletionRequest.type = new messages_1.ProtocolRequestType(CompletionRequest.method);
+    /** @deprecated Use CompletionRequest.type */
     CompletionRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(CompletionRequest = exports.CompletionRequest || (exports.CompletionRequest = {}));
 /**
@@ -4862,7 +4871,7 @@ var CompletionRequest;
 var CompletionResolveRequest;
 (function (CompletionResolveRequest) {
     CompletionResolveRequest.method = 'completionItem/resolve';
-    CompletionResolveRequest.type = new vscode_jsonrpc_1.RequestType(CompletionResolveRequest.method);
+    CompletionResolveRequest.type = new messages_1.ProtocolRequestType(CompletionResolveRequest.method);
 })(CompletionResolveRequest = exports.CompletionResolveRequest || (exports.CompletionResolveRequest = {}));
 /**
  * Request to request hover information at a given text document position. The request's
@@ -4872,7 +4881,7 @@ var CompletionResolveRequest;
 var HoverRequest;
 (function (HoverRequest) {
     HoverRequest.method = 'textDocument/hover';
-    HoverRequest.type = new vscode_jsonrpc_1.RequestType(HoverRequest.method);
+    HoverRequest.type = new messages_1.ProtocolRequestType(HoverRequest.method);
 })(HoverRequest = exports.HoverRequest || (exports.HoverRequest = {}));
 /**
  * How a signature help was triggered.
@@ -4897,7 +4906,7 @@ var SignatureHelpTriggerKind;
 var SignatureHelpRequest;
 (function (SignatureHelpRequest) {
     SignatureHelpRequest.method = 'textDocument/signatureHelp';
-    SignatureHelpRequest.type = new vscode_jsonrpc_1.RequestType(SignatureHelpRequest.method);
+    SignatureHelpRequest.type = new messages_1.ProtocolRequestType(SignatureHelpRequest.method);
 })(SignatureHelpRequest = exports.SignatureHelpRequest || (exports.SignatureHelpRequest = {}));
 /**
  * A request to resolve the definition location of a symbol at a given text
@@ -4909,7 +4918,8 @@ var SignatureHelpRequest;
 var DefinitionRequest;
 (function (DefinitionRequest) {
     DefinitionRequest.method = 'textDocument/definition';
-    DefinitionRequest.type = new vscode_jsonrpc_1.RequestType(DefinitionRequest.method);
+    DefinitionRequest.type = new messages_1.ProtocolRequestType(DefinitionRequest.method);
+    /** @deprecated Use DefinitionRequest.type */
     DefinitionRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(DefinitionRequest = exports.DefinitionRequest || (exports.DefinitionRequest = {}));
 /**
@@ -4921,7 +4931,8 @@ var DefinitionRequest;
 var ReferencesRequest;
 (function (ReferencesRequest) {
     ReferencesRequest.method = 'textDocument/references';
-    ReferencesRequest.type = new vscode_jsonrpc_1.RequestType(ReferencesRequest.method);
+    ReferencesRequest.type = new messages_1.ProtocolRequestType(ReferencesRequest.method);
+    /** @deprecated Use ReferencesRequest.type */
     ReferencesRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(ReferencesRequest = exports.ReferencesRequest || (exports.ReferencesRequest = {}));
 /**
@@ -4933,7 +4944,8 @@ var ReferencesRequest;
 var DocumentHighlightRequest;
 (function (DocumentHighlightRequest) {
     DocumentHighlightRequest.method = 'textDocument/documentHighlight';
-    DocumentHighlightRequest.type = new vscode_jsonrpc_1.RequestType(DocumentHighlightRequest.method);
+    DocumentHighlightRequest.type = new messages_1.ProtocolRequestType(DocumentHighlightRequest.method);
+    /** @deprecated Use DocumentHighlightRequest.type */
     DocumentHighlightRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(DocumentHighlightRequest = exports.DocumentHighlightRequest || (exports.DocumentHighlightRequest = {}));
 /**
@@ -4945,7 +4957,8 @@ var DocumentHighlightRequest;
 var DocumentSymbolRequest;
 (function (DocumentSymbolRequest) {
     DocumentSymbolRequest.method = 'textDocument/documentSymbol';
-    DocumentSymbolRequest.type = new vscode_jsonrpc_1.RequestType(DocumentSymbolRequest.method);
+    DocumentSymbolRequest.type = new messages_1.ProtocolRequestType(DocumentSymbolRequest.method);
+    /** @deprecated Use DocumentSymbolRequest.type */
     DocumentSymbolRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(DocumentSymbolRequest = exports.DocumentSymbolRequest || (exports.DocumentSymbolRequest = {}));
 /**
@@ -4954,7 +4967,8 @@ var DocumentSymbolRequest;
 var CodeActionRequest;
 (function (CodeActionRequest) {
     CodeActionRequest.method = 'textDocument/codeAction';
-    CodeActionRequest.type = new vscode_jsonrpc_1.RequestType(CodeActionRequest.method);
+    CodeActionRequest.type = new messages_1.ProtocolRequestType(CodeActionRequest.method);
+    /** @deprecated Use CodeActionRequest.type */
     CodeActionRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(CodeActionRequest = exports.CodeActionRequest || (exports.CodeActionRequest = {}));
 /**
@@ -4966,7 +4980,8 @@ var CodeActionRequest;
 var WorkspaceSymbolRequest;
 (function (WorkspaceSymbolRequest) {
     WorkspaceSymbolRequest.method = 'workspace/symbol';
-    WorkspaceSymbolRequest.type = new vscode_jsonrpc_1.RequestType(WorkspaceSymbolRequest.method);
+    WorkspaceSymbolRequest.type = new messages_1.ProtocolRequestType(WorkspaceSymbolRequest.method);
+    /** @deprecated Use WorkspaceSymbolRequest.type */
     WorkspaceSymbolRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(WorkspaceSymbolRequest = exports.WorkspaceSymbolRequest || (exports.WorkspaceSymbolRequest = {}));
 /**
@@ -4974,7 +4989,8 @@ var WorkspaceSymbolRequest;
  */
 var CodeLensRequest;
 (function (CodeLensRequest) {
-    CodeLensRequest.type = new vscode_jsonrpc_1.RequestType('textDocument/codeLens');
+    CodeLensRequest.type = new messages_1.ProtocolRequestType('textDocument/codeLens');
+    /** @deprecated Use CodeLensRequest.type */
     CodeLensRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(CodeLensRequest = exports.CodeLensRequest || (exports.CodeLensRequest = {}));
 /**
@@ -4982,7 +4998,7 @@ var CodeLensRequest;
  */
 var CodeLensResolveRequest;
 (function (CodeLensResolveRequest) {
-    CodeLensResolveRequest.type = new vscode_jsonrpc_1.RequestType('codeLens/resolve');
+    CodeLensResolveRequest.type = new messages_1.ProtocolRequestType('codeLens/resolve');
 })(CodeLensResolveRequest = exports.CodeLensResolveRequest || (exports.CodeLensResolveRequest = {}));
 /**
  * A request to provide document links
@@ -4990,7 +5006,8 @@ var CodeLensResolveRequest;
 var DocumentLinkRequest;
 (function (DocumentLinkRequest) {
     DocumentLinkRequest.method = 'textDocument/documentLink';
-    DocumentLinkRequest.type = new vscode_jsonrpc_1.RequestType(DocumentLinkRequest.method);
+    DocumentLinkRequest.type = new messages_1.ProtocolRequestType(DocumentLinkRequest.method);
+    /** @deprecated Use DocumentLinkRequest.type */
     DocumentLinkRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(DocumentLinkRequest = exports.DocumentLinkRequest || (exports.DocumentLinkRequest = {}));
 /**
@@ -5000,7 +5017,7 @@ var DocumentLinkRequest;
  */
 var DocumentLinkResolveRequest;
 (function (DocumentLinkResolveRequest) {
-    DocumentLinkResolveRequest.type = new vscode_jsonrpc_1.RequestType('documentLink/resolve');
+    DocumentLinkResolveRequest.type = new messages_1.ProtocolRequestType('documentLink/resolve');
 })(DocumentLinkResolveRequest = exports.DocumentLinkResolveRequest || (exports.DocumentLinkResolveRequest = {}));
 /**
  * A request to to format a whole document.
@@ -5008,7 +5025,7 @@ var DocumentLinkResolveRequest;
 var DocumentFormattingRequest;
 (function (DocumentFormattingRequest) {
     DocumentFormattingRequest.method = 'textDocument/formatting';
-    DocumentFormattingRequest.type = new vscode_jsonrpc_1.RequestType(DocumentFormattingRequest.method);
+    DocumentFormattingRequest.type = new messages_1.ProtocolRequestType(DocumentFormattingRequest.method);
 })(DocumentFormattingRequest = exports.DocumentFormattingRequest || (exports.DocumentFormattingRequest = {}));
 /**
  * A request to to format a range in a document.
@@ -5016,7 +5033,7 @@ var DocumentFormattingRequest;
 var DocumentRangeFormattingRequest;
 (function (DocumentRangeFormattingRequest) {
     DocumentRangeFormattingRequest.method = 'textDocument/rangeFormatting';
-    DocumentRangeFormattingRequest.type = new vscode_jsonrpc_1.RequestType(DocumentRangeFormattingRequest.method);
+    DocumentRangeFormattingRequest.type = new messages_1.ProtocolRequestType(DocumentRangeFormattingRequest.method);
 })(DocumentRangeFormattingRequest = exports.DocumentRangeFormattingRequest || (exports.DocumentRangeFormattingRequest = {}));
 /**
  * A request to format a document on type.
@@ -5024,7 +5041,7 @@ var DocumentRangeFormattingRequest;
 var DocumentOnTypeFormattingRequest;
 (function (DocumentOnTypeFormattingRequest) {
     DocumentOnTypeFormattingRequest.method = 'textDocument/onTypeFormatting';
-    DocumentOnTypeFormattingRequest.type = new vscode_jsonrpc_1.RequestType(DocumentOnTypeFormattingRequest.method);
+    DocumentOnTypeFormattingRequest.type = new messages_1.ProtocolRequestType(DocumentOnTypeFormattingRequest.method);
 })(DocumentOnTypeFormattingRequest = exports.DocumentOnTypeFormattingRequest || (exports.DocumentOnTypeFormattingRequest = {}));
 /**
  * A request to rename a symbol.
@@ -5032,7 +5049,7 @@ var DocumentOnTypeFormattingRequest;
 var RenameRequest;
 (function (RenameRequest) {
     RenameRequest.method = 'textDocument/rename';
-    RenameRequest.type = new vscode_jsonrpc_1.RequestType(RenameRequest.method);
+    RenameRequest.type = new messages_1.ProtocolRequestType(RenameRequest.method);
 })(RenameRequest = exports.RenameRequest || (exports.RenameRequest = {}));
 /**
  * A request to test and perform the setup necessary for a rename.
@@ -5040,7 +5057,7 @@ var RenameRequest;
 var PrepareRenameRequest;
 (function (PrepareRenameRequest) {
     PrepareRenameRequest.method = 'textDocument/prepareRename';
-    PrepareRenameRequest.type = new vscode_jsonrpc_1.RequestType(PrepareRenameRequest.method);
+    PrepareRenameRequest.type = new messages_1.ProtocolRequestType(PrepareRenameRequest.method);
 })(PrepareRenameRequest = exports.PrepareRenameRequest || (exports.PrepareRenameRequest = {}));
 /**
  * A request send from the client to the server to execute a command. The request might return
@@ -5048,14 +5065,14 @@ var PrepareRenameRequest;
  */
 var ExecuteCommandRequest;
 (function (ExecuteCommandRequest) {
-    ExecuteCommandRequest.type = new vscode_jsonrpc_1.RequestType('workspace/executeCommand');
+    ExecuteCommandRequest.type = new messages_1.ProtocolRequestType('workspace/executeCommand');
 })(ExecuteCommandRequest = exports.ExecuteCommandRequest || (exports.ExecuteCommandRequest = {}));
 /**
  * A request sent from the server to the client to modified certain resources.
  */
 var ApplyWorkspaceEditRequest;
 (function (ApplyWorkspaceEditRequest) {
-    ApplyWorkspaceEditRequest.type = new vscode_jsonrpc_1.RequestType('workspace/applyEdit');
+    ApplyWorkspaceEditRequest.type = new messages_1.ProtocolRequestType('workspace/applyEdit');
 })(ApplyWorkspaceEditRequest = exports.ApplyWorkspaceEditRequest || (exports.ApplyWorkspaceEditRequest = {}));
 
 
@@ -5123,6 +5140,45 @@ exports.objectLiteral = objectLiteral;
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = __webpack_require__(5);
+class ProtocolRequestType0 extends vscode_jsonrpc_1.RequestType0 {
+    constructor(method) {
+        super(method);
+    }
+}
+exports.ProtocolRequestType0 = ProtocolRequestType0;
+class ProtocolRequestType extends vscode_jsonrpc_1.RequestType {
+    constructor(method) {
+        super(method);
+    }
+}
+exports.ProtocolRequestType = ProtocolRequestType;
+class ProtocolNotificationType extends vscode_jsonrpc_1.NotificationType {
+    constructor(method) {
+        super(method);
+    }
+}
+exports.ProtocolNotificationType = ProtocolNotificationType;
+class ProtocolNotificationType0 extends vscode_jsonrpc_1.NotificationType0 {
+    constructor(method) {
+        super(method);
+    }
+}
+exports.ProtocolNotificationType0 = ProtocolNotificationType0;
+
+
+/***/ }),
+/* 22 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 // @ts-ignore: to avoid inlining LocatioLink as dynamic import
 let __noDynamicImport;
 /**
@@ -5134,13 +5190,14 @@ let __noDynamicImport;
 var ImplementationRequest;
 (function (ImplementationRequest) {
     ImplementationRequest.method = 'textDocument/implementation';
-    ImplementationRequest.type = new vscode_jsonrpc_1.RequestType(ImplementationRequest.method);
+    ImplementationRequest.type = new messages_1.ProtocolRequestType(ImplementationRequest.method);
+    /** @deprecated Use ImplementationRequest.type */
     ImplementationRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(ImplementationRequest = exports.ImplementationRequest || (exports.ImplementationRequest = {}));
 
 
 /***/ }),
-/* 22 */
+/* 23 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5151,6 +5208,7 @@ var ImplementationRequest;
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 // @ts-ignore: to avoid inlining LocatioLink as dynamic import
 let __noDynamicImport;
 /**
@@ -5162,13 +5220,14 @@ let __noDynamicImport;
 var TypeDefinitionRequest;
 (function (TypeDefinitionRequest) {
     TypeDefinitionRequest.method = 'textDocument/typeDefinition';
-    TypeDefinitionRequest.type = new vscode_jsonrpc_1.RequestType(TypeDefinitionRequest.method);
+    TypeDefinitionRequest.type = new messages_1.ProtocolRequestType(TypeDefinitionRequest.method);
+    /** @deprecated Use TypeDefinitionRequest.type */
     TypeDefinitionRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(TypeDefinitionRequest = exports.TypeDefinitionRequest || (exports.TypeDefinitionRequest = {}));
 
 
 /***/ }),
-/* 23 */
+/* 24 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5178,13 +5237,13 @@ var TypeDefinitionRequest;
  * ------------------------------------------------------------------------------------------ */
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 /**
  * The `workspace/workspaceFolders` is sent from the server to the client to fetch the open workspace folders.
  */
 var WorkspaceFoldersRequest;
 (function (WorkspaceFoldersRequest) {
-    WorkspaceFoldersRequest.type = new vscode_jsonrpc_1.RequestType0('workspace/workspaceFolders');
+    WorkspaceFoldersRequest.type = new messages_1.ProtocolRequestType0('workspace/workspaceFolders');
 })(WorkspaceFoldersRequest = exports.WorkspaceFoldersRequest || (exports.WorkspaceFoldersRequest = {}));
 /**
  * The `workspace/didChangeWorkspaceFolders` notification is sent from the client to the server when the workspace
@@ -5192,12 +5251,12 @@ var WorkspaceFoldersRequest;
  */
 var DidChangeWorkspaceFoldersNotification;
 (function (DidChangeWorkspaceFoldersNotification) {
-    DidChangeWorkspaceFoldersNotification.type = new vscode_jsonrpc_1.NotificationType('workspace/didChangeWorkspaceFolders');
+    DidChangeWorkspaceFoldersNotification.type = new messages_1.ProtocolNotificationType('workspace/didChangeWorkspaceFolders');
 })(DidChangeWorkspaceFoldersNotification = exports.DidChangeWorkspaceFoldersNotification || (exports.DidChangeWorkspaceFoldersNotification = {}));
 
 
 /***/ }),
-/* 24 */
+/* 25 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5207,7 +5266,7 @@ var DidChangeWorkspaceFoldersNotification;
  * ------------------------------------------------------------------------------------------ */
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 /**
  * The 'workspace/configuration' request is sent from the server to the client to fetch a certain
  * configuration setting.
@@ -5219,12 +5278,12 @@ const vscode_jsonrpc_1 = __webpack_require__(5);
  */
 var ConfigurationRequest;
 (function (ConfigurationRequest) {
-    ConfigurationRequest.type = new vscode_jsonrpc_1.RequestType('workspace/configuration');
+    ConfigurationRequest.type = new messages_1.ProtocolRequestType('workspace/configuration');
 })(ConfigurationRequest = exports.ConfigurationRequest || (exports.ConfigurationRequest = {}));
 
 
 /***/ }),
-/* 25 */
+/* 26 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5235,6 +5294,7 @@ var ConfigurationRequest;
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 /**
  * A request to list all color symbols found in a given text document. The request's
  * parameter is of type [DocumentColorParams](#DocumentColorParams) the
@@ -5244,7 +5304,8 @@ const vscode_jsonrpc_1 = __webpack_require__(5);
 var DocumentColorRequest;
 (function (DocumentColorRequest) {
     DocumentColorRequest.method = 'textDocument/documentColor';
-    DocumentColorRequest.type = new vscode_jsonrpc_1.RequestType(DocumentColorRequest.method);
+    DocumentColorRequest.type = new messages_1.ProtocolRequestType(DocumentColorRequest.method);
+    /** @deprecated Use DocumentColorRequest.type */
     DocumentColorRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(DocumentColorRequest = exports.DocumentColorRequest || (exports.DocumentColorRequest = {}));
 /**
@@ -5255,12 +5316,12 @@ var DocumentColorRequest;
  */
 var ColorPresentationRequest;
 (function (ColorPresentationRequest) {
-    ColorPresentationRequest.type = new vscode_jsonrpc_1.RequestType('textDocument/colorPresentation');
+    ColorPresentationRequest.type = new messages_1.ProtocolRequestType('textDocument/colorPresentation');
 })(ColorPresentationRequest = exports.ColorPresentationRequest || (exports.ColorPresentationRequest = {}));
 
 
 /***/ }),
-/* 26 */
+/* 27 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5271,6 +5332,7 @@ var ColorPresentationRequest;
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 /**
  * Enum of known range kinds
  */
@@ -5298,13 +5360,14 @@ var FoldingRangeKind;
 var FoldingRangeRequest;
 (function (FoldingRangeRequest) {
     FoldingRangeRequest.method = 'textDocument/foldingRange';
-    FoldingRangeRequest.type = new vscode_jsonrpc_1.RequestType(FoldingRangeRequest.method);
+    FoldingRangeRequest.type = new messages_1.ProtocolRequestType(FoldingRangeRequest.method);
+    /** @deprecated Use FoldingRangeRequest.type */
     FoldingRangeRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(FoldingRangeRequest = exports.FoldingRangeRequest || (exports.FoldingRangeRequest = {}));
 
 
 /***/ }),
-/* 27 */
+/* 28 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5315,6 +5378,7 @@ var FoldingRangeRequest;
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 // @ts-ignore: to avoid inlining LocatioLink as dynamic import
 let __noDynamicImport;
 /**
@@ -5327,13 +5391,14 @@ let __noDynamicImport;
 var DeclarationRequest;
 (function (DeclarationRequest) {
     DeclarationRequest.method = 'textDocument/declaration';
-    DeclarationRequest.type = new vscode_jsonrpc_1.RequestType(DeclarationRequest.method);
+    DeclarationRequest.type = new messages_1.ProtocolRequestType(DeclarationRequest.method);
+    /** @deprecated Use DeclarationRequest.type */
     DeclarationRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(DeclarationRequest = exports.DeclarationRequest || (exports.DeclarationRequest = {}));
 
 
 /***/ }),
-/* 28 */
+/* 29 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5344,6 +5409,7 @@ var DeclarationRequest;
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 /**
  * A request to provide selection ranges in a document. The request's
  * parameter is of type [SelectionRangeParams](#SelectionRangeParams), the
@@ -5353,13 +5419,14 @@ const vscode_jsonrpc_1 = __webpack_require__(5);
 var SelectionRangeRequest;
 (function (SelectionRangeRequest) {
     SelectionRangeRequest.method = 'textDocument/selectionRange';
-    SelectionRangeRequest.type = new vscode_jsonrpc_1.RequestType(SelectionRangeRequest.method);
+    SelectionRangeRequest.type = new messages_1.ProtocolRequestType(SelectionRangeRequest.method);
+    /** @deprecated  Use SelectionRangeRequest.type */
     SelectionRangeRequest.resultType = new vscode_jsonrpc_1.ProgressType();
 })(SelectionRangeRequest = exports.SelectionRangeRequest || (exports.SelectionRangeRequest = {}));
 
 
 /***/ }),
-/* 29 */
+/* 30 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5370,6 +5437,7 @@ var SelectionRangeRequest;
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
 var WorkDoneProgress;
 (function (WorkDoneProgress) {
     WorkDoneProgress.type = new vscode_jsonrpc_1.ProgressType();
@@ -5380,7 +5448,7 @@ var WorkDoneProgress;
  */
 var WorkDoneProgressCreateRequest;
 (function (WorkDoneProgressCreateRequest) {
-    WorkDoneProgressCreateRequest.type = new vscode_jsonrpc_1.RequestType('window/workDoneProgress/create');
+    WorkDoneProgressCreateRequest.type = new messages_1.ProtocolRequestType('window/workDoneProgress/create');
 })(WorkDoneProgressCreateRequest = exports.WorkDoneProgressCreateRequest || (exports.WorkDoneProgressCreateRequest = {}));
 /**
  * The `window/workDoneProgress/cancel` notification is sent from  the client to the server to cancel a progress
@@ -5388,12 +5456,12 @@ var WorkDoneProgressCreateRequest;
  */
 var WorkDoneProgressCancelNotification;
 (function (WorkDoneProgressCancelNotification) {
-    WorkDoneProgressCancelNotification.type = new vscode_jsonrpc_1.NotificationType('window/workDoneProgress/cancel');
+    WorkDoneProgressCancelNotification.type = new messages_1.ProtocolNotificationType('window/workDoneProgress/cancel');
 })(WorkDoneProgressCancelNotification = exports.WorkDoneProgressCancelNotification || (exports.WorkDoneProgressCancelNotification = {}));
 
 
 /***/ }),
-/* 30 */
+/* 31 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5403,80 +5471,183 @@ var WorkDoneProgressCancelNotification;
  * ------------------------------------------------------------------------------------------ */
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const vscode_jsonrpc_1 = __webpack_require__(5);
+const messages_1 = __webpack_require__(21);
+/**
+ * A request to result a `CallHierarchyItem` in a document at a given position.
+ * Can be used as an input to a incoming or outgoing call hierarchy.
+ *
+ * @since 3.16.0 - Proposed state
+ */
 var CallHierarchyPrepareRequest;
 (function (CallHierarchyPrepareRequest) {
     CallHierarchyPrepareRequest.method = 'textDocument/prepareCallHierarchy';
-    CallHierarchyPrepareRequest.type = new vscode_jsonrpc_1.RequestType(CallHierarchyPrepareRequest.method);
+    CallHierarchyPrepareRequest.type = new messages_1.ProtocolRequestType(CallHierarchyPrepareRequest.method);
 })(CallHierarchyPrepareRequest = exports.CallHierarchyPrepareRequest || (exports.CallHierarchyPrepareRequest = {}));
+/**
+ * A request to resolve the incoming calls for a given `CallHierarchyItem`.
+ *
+ * @since 3.16.0 - Proposed state
+ */
 var CallHierarchyIncomingCallsRequest;
 (function (CallHierarchyIncomingCallsRequest) {
     CallHierarchyIncomingCallsRequest.method = 'callHierarchy/incomingCalls';
-    CallHierarchyIncomingCallsRequest.type = new vscode_jsonrpc_1.RequestType(CallHierarchyIncomingCallsRequest.method);
-    CallHierarchyIncomingCallsRequest.resultType = new vscode_jsonrpc_1.ProgressType();
+    CallHierarchyIncomingCallsRequest.type = new messages_1.ProtocolRequestType(CallHierarchyIncomingCallsRequest.method);
 })(CallHierarchyIncomingCallsRequest = exports.CallHierarchyIncomingCallsRequest || (exports.CallHierarchyIncomingCallsRequest = {}));
+/**
+ * A request to resolve the outgoing calls for a given `CallHierarchyItem`.
+ *
+ * @since 3.16.0 - Proposed state
+ */
 var CallHierarchyOutgoingCallsRequest;
 (function (CallHierarchyOutgoingCallsRequest) {
     CallHierarchyOutgoingCallsRequest.method = 'callHierarchy/outgoingCalls';
-    CallHierarchyOutgoingCallsRequest.type = new vscode_jsonrpc_1.RequestType(CallHierarchyOutgoingCallsRequest.method);
-    CallHierarchyOutgoingCallsRequest.resultType = new vscode_jsonrpc_1.ProgressType();
+    CallHierarchyOutgoingCallsRequest.type = new messages_1.ProtocolRequestType(CallHierarchyOutgoingCallsRequest.method);
 })(CallHierarchyOutgoingCallsRequest = exports.CallHierarchyOutgoingCallsRequest || (exports.CallHierarchyOutgoingCallsRequest = {}));
 
 
 /***/ }),
-/* 31 */
+/* 32 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const messages_1 = __webpack_require__(21);
+/**
+ * A set of predefined token types. This set is not fixed
+ * an clients can specify additional token types via the
+ * corresponding client capabilities.
+ *
+ * @since 3.16.0 - Proposed state
+ */
+var SemanticTokenTypes;
+(function (SemanticTokenTypes) {
+    SemanticTokenTypes["comment"] = "comment";
+    SemanticTokenTypes["keyword"] = "keyword";
+    SemanticTokenTypes["string"] = "string";
+    SemanticTokenTypes["number"] = "number";
+    SemanticTokenTypes["regexp"] = "regexp";
+    SemanticTokenTypes["operator"] = "operator";
+    SemanticTokenTypes["namespace"] = "namespace";
+    SemanticTokenTypes["type"] = "type";
+    SemanticTokenTypes["struct"] = "struct";
+    SemanticTokenTypes["class"] = "class";
+    SemanticTokenTypes["interface"] = "interface";
+    SemanticTokenTypes["enum"] = "enum";
+    SemanticTokenTypes["typeParameter"] = "typeParameter";
+    SemanticTokenTypes["function"] = "function";
+    SemanticTokenTypes["member"] = "member";
+    SemanticTokenTypes["property"] = "property";
+    SemanticTokenTypes["macro"] = "macro";
+    SemanticTokenTypes["variable"] = "variable";
+    SemanticTokenTypes["parameter"] = "parameter";
+    SemanticTokenTypes["label"] = "label";
+})(SemanticTokenTypes = exports.SemanticTokenTypes || (exports.SemanticTokenTypes = {}));
+/**
+ * A set of predefined token modifiers. This set is not fixed
+ * an clients can specify additional token types via the
+ * corresponding client capabilities.
+ *
+ * @since 3.16.0 - Proposed state
+ */
+var SemanticTokenModifiers;
+(function (SemanticTokenModifiers) {
+    SemanticTokenModifiers["documentation"] = "documentation";
+    SemanticTokenModifiers["declaration"] = "declaration";
+    SemanticTokenModifiers["definition"] = "definition";
+    SemanticTokenModifiers["reference"] = "reference";
+    SemanticTokenModifiers["static"] = "static";
+    SemanticTokenModifiers["abstract"] = "abstract";
+    SemanticTokenModifiers["deprecated"] = "deprecated";
+    SemanticTokenModifiers["async"] = "async";
+    SemanticTokenModifiers["volatile"] = "volatile";
+    SemanticTokenModifiers["readonly"] = "readonly";
+})(SemanticTokenModifiers = exports.SemanticTokenModifiers || (exports.SemanticTokenModifiers = {}));
+/**
+ * @since 3.16.0 - Proposed state
+ */
+var SemanticTokens;
+(function (SemanticTokens) {
+    function is(value) {
+        const candidate = value;
+        return candidate !== undefined && (candidate.resultId === undefined || typeof candidate.resultId === 'string') &&
+            Array.isArray(candidate.data) && (candidate.data.length === 0 || typeof candidate.data[0] === 'number');
+    }
+    SemanticTokens.is = is;
+})(SemanticTokens = exports.SemanticTokens || (exports.SemanticTokens = {}));
+/**
+ * @since 3.16.0 - Proposed state
+ */
+var SemanticTokensRequest;
+(function (SemanticTokensRequest) {
+    SemanticTokensRequest.method = 'textDocument/semanticTokens';
+    SemanticTokensRequest.type = new messages_1.ProtocolRequestType(SemanticTokensRequest.method);
+})(SemanticTokensRequest = exports.SemanticTokensRequest || (exports.SemanticTokensRequest = {}));
+/**
+ * @since 3.16.0 - Proposed state
+ */
+var SemanticTokensEditsRequest;
+(function (SemanticTokensEditsRequest) {
+    SemanticTokensEditsRequest.method = 'textDocument/semanticTokens/edits';
+    SemanticTokensEditsRequest.type = new messages_1.ProtocolRequestType(SemanticTokensEditsRequest.method);
+})(SemanticTokensEditsRequest = exports.SemanticTokensEditsRequest || (exports.SemanticTokensEditsRequest = {}));
+/**
+ * @since 3.16.0 - Proposed state
+ */
+var SemanticTokensRangeRequest;
+(function (SemanticTokensRangeRequest) {
+    SemanticTokensRangeRequest.method = 'textDocument/semanticTokens/range';
+    SemanticTokensRangeRequest.type = new messages_1.ProtocolRequestType(SemanticTokensRangeRequest.method);
+})(SemanticTokensRangeRequest = exports.SemanticTokensRangeRequest || (exports.SemanticTokensRangeRequest = {}));
+
+
+/***/ }),
+/* 33 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(__webpack_require__(3));
 const fs_1 = __importDefault(__webpack_require__(2));
-const which_1 = __importDefault(__webpack_require__(32));
+const which_1 = __importDefault(__webpack_require__(34));
 function exists(file) {
     return fs_1.default.existsSync(file);
 }
-function findEslint(rootPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const platform = process.platform;
-        if (platform === 'win32' &&
-            (exists(path_1.default.join(rootPath, 'node_modules', '.bin', 'eslint.cmd')))) {
-            return path_1.default.join('.', 'node_modules', '.bin', 'eslint.cmd');
-        }
-        else if ((platform === 'linux' || platform === 'darwin') &&
-            (exists(path_1.default.join(rootPath, 'node_modules', '.bin', 'eslint')))) {
-            return path_1.default.join('.', 'node_modules', '.bin', 'eslint');
-        }
-        else if (exists(path_1.default.join(rootPath, '.vscode', 'pnpify', 'eslint', 'bin', 'eslint.js'))) {
-            return path_1.default.join('.', '.vscode', 'pnpify', 'eslint', 'bin', 'eslint.js');
+async function findEslint(rootPath) {
+    const platform = process.platform;
+    if (platform === 'win32' &&
+        (exists(path_1.default.join(rootPath, 'node_modules', '.bin', 'eslint.cmd')))) {
+        return path_1.default.join('.', 'node_modules', '.bin', 'eslint.cmd');
+    }
+    else if ((platform === 'linux' || platform === 'darwin') &&
+        (exists(path_1.default.join(rootPath, 'node_modules', '.bin', 'eslint')))) {
+        return path_1.default.join('.', 'node_modules', '.bin', 'eslint');
+    }
+    else if (exists(path_1.default.join(rootPath, '.vscode', 'pnpify', 'eslint', 'bin', 'eslint.js'))) {
+        return path_1.default.join('.', '.vscode', 'pnpify', 'eslint', 'bin', 'eslint.js');
+    }
+    else {
+        try {
+            return which_1.default.sync('eslint');
         }
-        else {
-            try {
-                return which_1.default.sync('eslint');
-            }
-            catch (e) {
-                return '';
-            }
+        catch (e) {
+            return '';
         }
-    });
+    }
 }
 exports.findEslint = findEslint;
 
 
 /***/ }),
-/* 32 */
+/* 34 */
 /***/ (function(module, exports, __webpack_require__) {
 
 const isWindows = process.platform === 'win32' ||
@@ -5485,7 +5656,7 @@ const isWindows = process.platform === 'win32' ||
 
 const path = __webpack_require__(3)
 const COLON = isWindows ? ';' : ':'
-const isexe = __webpack_require__(33)
+const isexe = __webpack_require__(35)
 
 const getNotFoundError = (cmd) =>
   Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
@@ -5607,15 +5778,15 @@ which.sync = whichSync
 
 
 /***/ }),
-/* 33 */
+/* 35 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var fs = __webpack_require__(2)
 var core
 if (process.platform === 'win32' || global.TESTING_WINDOWS) {
-  core = __webpack_require__(34)
+  core = __webpack_require__(36)
 } else {
-  core = __webpack_require__(35)
+  core = __webpack_require__(37)
 }
 
 module.exports = isexe
@@ -5670,7 +5841,7 @@ function sync (path, options) {
 
 
 /***/ }),
-/* 34 */
+/* 36 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = isexe
@@ -5718,7 +5889,7 @@ function sync (path, options) {
 
 
 /***/ }),
-/* 35 */
+/* 37 */
 /***/ (function(module, exports, __webpack_require__) {
 
 module.exports = isexe