X-Git-Url: https://git.josue.xyz/?p=dotfiles%2F.git;a=blobdiff_plain;f=.config%2Fcoc%2Fextensions%2Fnode_modules%2Fcoc-eslint%2Flib%2Fserver.js;h=475b65c15460ab33fdd7e8651bdd7f981336d327;hp=7894d4697dfa6db91a228d429770e7aac4282591;hb=4d07c77cf4d78cab8639e13ddc3c22495e585b0b;hpb=b3950616b54221c40a7dab9099bda675007e5b6e

diff --git a/.config/coc/extensions/node_modules/coc-eslint/lib/server.js b/.config/coc/extensions/node_modules/coc-eslint/lib/server.js
index 7894d469..475b65c1 100644
--- a/.config/coc/extensions/node_modules/coc-eslint/lib/server.js
+++ b/.config/coc/extensions/node_modules/coc-eslint/lib/server.js
@@ -81,7 +81,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 36);
+/******/ 	return __webpack_require__(__webpack_require__.s = 38);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -143,7 +143,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;
@@ -154,15 +155,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);
@@ -241,7 +258,6 @@ var ProgressNotification;
 })(ProgressNotification || (ProgressNotification = {}));
 class ProgressType {
     constructor() {
-        this._ = undefined;
     }
 }
 exports.ProgressType = ProgressType;
@@ -1252,84 +1268,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);
@@ -1340,70 +1354,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;
@@ -4116,25 +4120,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;
@@ -4177,7 +4182,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
@@ -4185,7 +4190,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) {
@@ -4222,7 +4227,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 = {}));
@@ -4276,7 +4281,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`;
@@ -4297,7 +4302,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 ----
 /**
@@ -4308,7 +4313,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 ----
 /**
@@ -4317,7 +4322,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
@@ -4326,7 +4331,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 ----
 /**
@@ -4357,7 +4362,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
@@ -4365,7 +4370,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
@@ -4373,7 +4378,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
 /**
@@ -4382,7 +4387,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
@@ -4419,7 +4424,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
@@ -4428,7 +4433,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
@@ -4442,7 +4447,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
@@ -4451,7 +4456,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.
@@ -4479,7 +4484,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
@@ -4492,7 +4497,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
@@ -4500,7 +4505,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
@@ -4541,7 +4546,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
@@ -4577,7 +4582,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 = {}));
 /**
@@ -4588,7 +4594,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
@@ -4598,7 +4604,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.
@@ -4623,7 +4629,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
@@ -4635,7 +4641,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 = {}));
 /**
@@ -4647,7 +4654,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 = {}));
 /**
@@ -4659,7 +4667,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 = {}));
 /**
@@ -4671,7 +4680,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 = {}));
 /**
@@ -4680,7 +4690,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 = {}));
 /**
@@ -4692,7 +4703,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 = {}));
 /**
@@ -4700,7 +4712,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 = {}));
 /**
@@ -4708,7 +4721,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
@@ -4716,7 +4729,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 = {}));
 /**
@@ -4726,7 +4740,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.
@@ -4734,7 +4748,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.
@@ -4742,7 +4756,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.
@@ -4750,7 +4764,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.
@@ -4758,7 +4772,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.
@@ -4766,7 +4780,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
@@ -4774,14 +4788,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 = {}));
 
 
@@ -4849,6 +4863,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;
 /**
@@ -4860,13 +4913,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";
@@ -4877,6 +4931,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;
 /**
@@ -4888,13 +4943,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";
@@ -4904,13 +4960,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
@@ -4918,12 +4974,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";
@@ -4933,7 +4989,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.
@@ -4945,12 +5001,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";
@@ -4961,6 +5017,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
@@ -4970,7 +5027,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 = {}));
 /**
@@ -4981,12 +5039,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";
@@ -4997,6 +5055,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
  */
@@ -5024,13 +5083,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";
@@ -5041,6 +5101,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;
 /**
@@ -5053,13 +5114,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";
@@ -5070,6 +5132,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
@@ -5079,13 +5142,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";
@@ -5096,6 +5160,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();
@@ -5106,7 +5171,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
@@ -5114,12 +5179,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";
@@ -5129,33 +5194,147 @@ 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 */,
+/* 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 */,
 /* 34 */,
 /* 35 */,
-/* 36 */
+/* 36 */,
+/* 37 */,
+/* 38 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -5164,15 +5343,6 @@ var CallHierarchyOutgoingCallsRequest;
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-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 __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -5183,11 +5353,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = __importStar(__webpack_require__(14));
 const path = __importStar(__webpack_require__(3));
-const vscode_languageserver_1 = __webpack_require__(37);
-const vscode_uri_1 = __webpack_require__(46);
-const types_1 = __webpack_require__(47);
-const util_1 = __webpack_require__(48);
-const vscode_languageserver_textdocument_1 = __webpack_require__(52);
+const vscode_languageserver_1 = __webpack_require__(39);
+const vscode_uri_1 = __webpack_require__(50);
+const types_1 = __webpack_require__(51);
+const util_1 = __webpack_require__(52);
+const vscode_languageserver_textdocument_1 = __webpack_require__(54);
 const requireFunc =  true ? require : undefined;
 var CommandIds;
 (function (CommandIds) {
@@ -5400,11 +5570,12 @@ function resolveSettings(document) {
                 nodePath = path.join(vscode_uri_1.URI.parse(settings.workspaceFolder.uri).fsPath, nodePath);
             }
         }
-        else if (settings.packageManager === 'npm') {
-            nodePath = globalNpmPath();
+        let resolvedGlobalPackageManagerPath;
+        if (settings.packageManager === 'npm') {
+            resolvedGlobalPackageManagerPath = globalNpmPath();
         }
         else if (settings.packageManager === 'yarn') {
-            nodePath = globalYarnPath();
+            resolvedGlobalPackageManagerPath = globalYarnPath();
         }
         let uri = vscode_uri_1.URI.parse(document.uri);
         let promise;
@@ -5415,9 +5586,14 @@ function resolveSettings(document) {
         else {
             directory = settings.workspaceFolder ? vscode_uri_1.URI.parse(settings.workspaceFolder.uri).fsPath : undefined;
         }
-        promise = util_1.resolveModule('./eslint', directory, nodePath).catch(() => {
-            return util_1.resolveModule('eslint', directory, nodePath);
-        });
+        if (nodePath !== undefined) {
+            promise = vscode_languageserver_1.Files.resolve('eslint', nodePath, nodePath, trace).then(undefined, () => {
+                return vscode_languageserver_1.Files.resolve('eslint', resolvedGlobalPackageManagerPath, directory, trace);
+            });
+        }
+        else {
+            promise = vscode_languageserver_1.Files.resolve('eslint', resolvedGlobalPackageManagerPath, directory, trace);
+        }
         return promise.then(path => {
             let library = path2Library.get(path);
             if (!library) {
@@ -5947,7 +6123,11 @@ class Fixes {
     }
     getAllSorted() {
         let result = [];
-        this.edits.forEach(value => result.push(value));
+        this.edits.forEach(value => {
+            if (value.edit != null) {
+                result.push(value);
+            }
+        });
         return result.sort((a, b) => {
             let d = a.edit.range[0] - b.edit.range[0];
             if (d !== 0) {
@@ -6004,7 +6184,11 @@ messageQueue.registerRequest(vscode_languageserver_1.CodeActionRequest.type, par
         return vscode_languageserver_1.TextEdit.insert(vscode_languageserver_1.Position.create(editInfo.line - 1, Number.MAX_VALUE), ` // eslint-disable-line ${editInfo.ruleId}`);
     }
     function createDisableFileTextEdit(editInfo) {
-        return vscode_languageserver_1.TextEdit.insert(vscode_languageserver_1.Position.create(0, 0), `/* eslint-disable ${editInfo.ruleId} */\n`);
+        var _a;
+        // If firts line contains a shebang, insert on the next line instead.
+        const shebang = (_a = textDocument) === null || _a === void 0 ? void 0 : _a.getText(vscode_languageserver_1.Range.create(vscode_languageserver_1.Position.create(0, 0), vscode_languageserver_1.Position.create(0, 2)));
+        const line = shebang === '#!' ? 1 : 0;
+        return vscode_languageserver_1.TextEdit.insert(vscode_languageserver_1.Position.create(line, 0), `/* eslint-disable ${editInfo.ruleId} */\n`);
     }
     function getLastEdit(array) {
         let length = array.length;
@@ -6018,11 +6202,13 @@ messageQueue.registerRequest(vscode_languageserver_1.CodeActionRequest.type, par
             documentVersion = editInfo.documentVersion;
             let ruleId = editInfo.ruleId;
             allFixableRuleIds.push(ruleId);
-            if (!!editInfo.edit) {
+            if (editInfo.edit != null) {
                 let workspaceChange = new vscode_languageserver_1.WorkspaceChange();
                 workspaceChange.getTextEditChange({ uri, version: documentVersion }).add(createTextEdit(editInfo));
                 commands.set(`${CommandIds.applySingleFix}:${ruleId}`, workspaceChange);
-                result.get(ruleId).fixes.push(vscode_languageserver_1.CodeAction.create(editInfo.label, vscode_languageserver_1.Command.create(editInfo.label, CommandIds.applySingleFix, ruleId), vscode_languageserver_1.CodeActionKind.QuickFix));
+                let action = vscode_languageserver_1.CodeAction.create(editInfo.label, vscode_languageserver_1.Command.create(editInfo.label, CommandIds.applySingleFix, ruleId), vscode_languageserver_1.CodeActionKind.QuickFix);
+                action.isPreferred = true;
+                result.get(ruleId).fixes.push(action);
             }
             if (settings.codeAction.disableRuleComment.enable) {
                 let workspaceChange = new vscode_languageserver_1.WorkspaceChange();
@@ -6096,7 +6282,7 @@ messageQueue.registerRequest(vscode_languageserver_1.CodeActionRequest.type, par
     let document = documents.get(params.textDocument.uri);
     return document ? document.version : undefined;
 });
-messageQueue.registerRequest(vscode_languageserver_1.ExecuteCommandRequest.type, (params) => __awaiter(void 0, void 0, void 0, function* () {
+messageQueue.registerRequest(vscode_languageserver_1.ExecuteCommandRequest.type, async (params) => {
     let workspaceChange;
     if (params.command === CommandIds.applyAutoFix) {
         let identifier = params.arguments[0];
@@ -6104,7 +6290,7 @@ messageQueue.registerRequest(vscode_languageserver_1.ExecuteCommandRequest.type,
             return {};
         }
         let textDocument = documents.get(identifier.uri);
-        let settings = yield Promise.resolve(resolveSettings(textDocument));
+        let settings = await Promise.resolve(resolveSettings(textDocument));
         let edits = util_1.getAllFixEdits(textDocument, settings);
         if (edits && edits.length) {
             workspaceChange = new vscode_languageserver_1.WorkspaceChange();
@@ -6121,7 +6307,7 @@ messageQueue.registerRequest(vscode_languageserver_1.ExecuteCommandRequest.type,
             let ruleId = params.arguments[0];
             let url = ruleDocData.urls.get(ruleId);
             if (url) {
-                yield connection.sendRequest(OpenESLintDocRequest.type, { url });
+                await connection.sendRequest(OpenESLintDocRequest.type, { url });
             }
         }
         else {
@@ -6132,7 +6318,7 @@ messageQueue.registerRequest(vscode_languageserver_1.ExecuteCommandRequest.type,
         return {};
     }
     try {
-        let response = yield Promise.resolve(connection.workspace.applyEdit(workspaceChange.edit));
+        let response = await Promise.resolve(connection.workspace.applyEdit(workspaceChange.edit));
         if (!response.applied) {
             connection.console.error(`Failed to apply command: ${params.command}`);
         }
@@ -6141,7 +6327,7 @@ messageQueue.registerRequest(vscode_languageserver_1.ExecuteCommandRequest.type,
         connection.console.error(`Failed to apply command: ${params.command}`);
     }
     return {};
-}), (params) => {
+}, (params) => {
     if (params.command === CommandIds.applyAutoFix) {
         let identifier = params.arguments[0];
         return identifier.version;
@@ -6154,7 +6340,7 @@ connection.tracer.connection.listen();
 
 
 /***/ }),
-/* 37 */
+/* 39 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -6170,14 +6356,14 @@ function __export(m) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_languageserver_protocol_1 = __webpack_require__(4);
 exports.Event = vscode_languageserver_protocol_1.Event;
-const configuration_1 = __webpack_require__(38);
-const workspaceFolders_1 = __webpack_require__(40);
-const progress_1 = __webpack_require__(41);
-const Is = __webpack_require__(39);
-const UUID = __webpack_require__(42);
+const configuration_1 = __webpack_require__(40);
+const workspaceFolders_1 = __webpack_require__(42);
+const progress_1 = __webpack_require__(43);
+const Is = __webpack_require__(41);
+const UUID = __webpack_require__(44);
 // ------------- Reexport the API surface of the language worker API ----------------------
 __export(__webpack_require__(4));
-const fm = __webpack_require__(43);
+const fm = __webpack_require__(45);
 var Files;
 (function (Files) {
     Files.uriToFilePath = fm.uriToFilePath;
@@ -6411,6 +6597,73 @@ class ErrorMessageTracker {
     }
 }
 exports.ErrorMessageTracker = ErrorMessageTracker;
+class RemoteConsoleImpl {
+    constructor() {
+    }
+    rawAttach(connection) {
+        this._rawConnection = connection;
+    }
+    attach(connection) {
+        this._connection = connection;
+    }
+    get connection() {
+        if (!this._connection) {
+            throw new Error('Remote is not attached to a connection yet.');
+        }
+        return this._connection;
+    }
+    fillServerCapabilities(_capabilities) {
+    }
+    initialize(_capabilities) {
+    }
+    error(message) {
+        this.send(vscode_languageserver_protocol_1.MessageType.Error, message);
+    }
+    warn(message) {
+        this.send(vscode_languageserver_protocol_1.MessageType.Warning, message);
+    }
+    info(message) {
+        this.send(vscode_languageserver_protocol_1.MessageType.Info, message);
+    }
+    log(message) {
+        this.send(vscode_languageserver_protocol_1.MessageType.Log, message);
+    }
+    send(type, message) {
+        if (this._rawConnection) {
+            this._rawConnection.sendNotification(vscode_languageserver_protocol_1.LogMessageNotification.type, { type, message });
+        }
+    }
+}
+class _RemoteWindowImpl {
+    constructor() {
+    }
+    attach(connection) {
+        this._connection = connection;
+    }
+    get connection() {
+        if (!this._connection) {
+            throw new Error('Remote is not attached to a connection yet.');
+        }
+        return this._connection;
+    }
+    initialize(_capabilities) {
+    }
+    fillServerCapabilities(_capabilities) {
+    }
+    showErrorMessage(message, ...actions) {
+        let params = { type: vscode_languageserver_protocol_1.MessageType.Error, message, actions };
+        return this._connection.sendRequest(vscode_languageserver_protocol_1.ShowMessageRequest.type, params).then(null2Undefined);
+    }
+    showWarningMessage(message, ...actions) {
+        let params = { type: vscode_languageserver_protocol_1.MessageType.Warning, message, actions };
+        return this._connection.sendRequest(vscode_languageserver_protocol_1.ShowMessageRequest.type, params).then(null2Undefined);
+    }
+    showInformationMessage(message, ...actions) {
+        let params = { type: vscode_languageserver_protocol_1.MessageType.Info, message, actions };
+        return this._connection.sendRequest(vscode_languageserver_protocol_1.ShowMessageRequest.type, params).then(null2Undefined);
+    }
+}
+const RemoteWindowImpl = progress_1.ProgressFeature(_RemoteWindowImpl);
 var BulkRegistration;
 (function (BulkRegistration) {
     /**
@@ -6499,73 +6752,6 @@ class BulkUnregistrationImpl {
         return true;
     }
 }
-class ConnectionLogger {
-    constructor() {
-    }
-    rawAttach(connection) {
-        this._rawConnection = connection;
-    }
-    attach(connection) {
-        this._connection = connection;
-    }
-    get connection() {
-        if (!this._connection) {
-            throw new Error('Remote is not attached to a connection yet.');
-        }
-        return this._connection;
-    }
-    fillServerCapabilities(_capabilities) {
-    }
-    initialize(_capabilities) {
-    }
-    error(message) {
-        this.send(vscode_languageserver_protocol_1.MessageType.Error, message);
-    }
-    warn(message) {
-        this.send(vscode_languageserver_protocol_1.MessageType.Warning, message);
-    }
-    info(message) {
-        this.send(vscode_languageserver_protocol_1.MessageType.Info, message);
-    }
-    log(message) {
-        this.send(vscode_languageserver_protocol_1.MessageType.Log, message);
-    }
-    send(type, message) {
-        if (this._rawConnection) {
-            this._rawConnection.sendNotification(vscode_languageserver_protocol_1.LogMessageNotification.type, { type, message });
-        }
-    }
-}
-class _RemoteWindowImpl {
-    constructor() {
-    }
-    attach(connection) {
-        this._connection = connection;
-    }
-    get connection() {
-        if (!this._connection) {
-            throw new Error('Remote is not attached to a connection yet.');
-        }
-        return this._connection;
-    }
-    initialize(_capabilities) {
-    }
-    fillServerCapabilities(_capabilities) {
-    }
-    showErrorMessage(message, ...actions) {
-        let params = { type: vscode_languageserver_protocol_1.MessageType.Error, message, actions };
-        return this._connection.sendRequest(vscode_languageserver_protocol_1.ShowMessageRequest.type, params).then(null2Undefined);
-    }
-    showWarningMessage(message, ...actions) {
-        let params = { type: vscode_languageserver_protocol_1.MessageType.Warning, message, actions };
-        return this._connection.sendRequest(vscode_languageserver_protocol_1.ShowMessageRequest.type, params).then(null2Undefined);
-    }
-    showInformationMessage(message, ...actions) {
-        let params = { type: vscode_languageserver_protocol_1.MessageType.Info, message, actions };
-        return this._connection.sendRequest(vscode_languageserver_protocol_1.ShowMessageRequest.type, params).then(null2Undefined);
-    }
-}
-const RemoteWindowImpl = progress_1.ProgressFeature(_RemoteWindowImpl);
 class RemoteClientImpl {
     attach(connection) {
         this._connection = connection;
@@ -6666,6 +6852,26 @@ class _RemoteWorkspaceImpl {
     }
 }
 const RemoteWorkspaceImpl = workspaceFolders_1.WorkspaceFoldersFeature(configuration_1.ConfigurationFeature(_RemoteWorkspaceImpl));
+class TelemetryImpl {
+    constructor() {
+    }
+    attach(connection) {
+        this._connection = connection;
+    }
+    get connection() {
+        if (!this._connection) {
+            throw new Error('Remote is not attached to a connection yet.');
+        }
+        return this._connection;
+    }
+    initialize(_capabilities) {
+    }
+    fillServerCapabilities(_capabilities) {
+    }
+    logEvent(data) {
+        this._connection.sendNotification(vscode_languageserver_protocol_1.TelemetryEventNotification.type, data);
+    }
+}
 class TracerImpl {
     constructor() {
         this._trace = vscode_languageserver_protocol_1.Trace.Off;
@@ -6696,7 +6902,7 @@ class TracerImpl {
         });
     }
 }
-class TelemetryImpl {
+class LanguagesImpl {
     constructor() {
     }
     attach(connection) {
@@ -6712,10 +6918,14 @@ class TelemetryImpl {
     }
     fillServerCapabilities(_capabilities) {
     }
-    logEvent(data) {
-        this._connection.sendNotification(vscode_languageserver_protocol_1.TelemetryEventNotification.type, data);
+    attachWorkDoneProgress(params) {
+        return progress_1.attachWorkDone(this.connection, params);
+    }
+    attachPartialResultProgress(_type, params) {
+        return progress_1.attachPartialResult(this.connection, params);
     }
 }
+exports.LanguagesImpl = LanguagesImpl;
 function combineConsoleFeatures(one, two) {
     return function (Base) {
         return two(one(Base));
@@ -6752,6 +6962,12 @@ function combineWorkspaceFeatures(one, two) {
     };
 }
 exports.combineWorkspaceFeatures = combineWorkspaceFeatures;
+function combineLanguagesFeatures(one, two) {
+    return function (Base) {
+        return two(one(Base));
+    };
+}
+exports.combineLanguagesFeatures = combineLanguagesFeatures;
 function combineFeatures(one, two) {
     function combine(one, two, func) {
         if (one && two) {
@@ -6863,7 +7079,7 @@ function _createConnection(input, output, strategy, factories) {
             process.exit(shutdownReceived ? 0 : 1);
         });
     }
-    const logger = (factories && factories.console ? new (factories.console(ConnectionLogger))() : new ConnectionLogger());
+    const logger = (factories && factories.console ? new (factories.console(RemoteConsoleImpl))() : new RemoteConsoleImpl());
     const connection = vscode_languageserver_protocol_1.createProtocolConnection(input, output, logger, strategy);
     logger.rawAttach(connection);
     const tracer = (factories && factories.tracer ? new (factories.tracer(TracerImpl))() : new TracerImpl());
@@ -6871,7 +7087,8 @@ function _createConnection(input, output, strategy, factories) {
     const client = (factories && factories.client ? new (factories.client(RemoteClientImpl))() : new RemoteClientImpl());
     const remoteWindow = (factories && factories.window ? new (factories.window(RemoteWindowImpl))() : new RemoteWindowImpl());
     const workspace = (factories && factories.workspace ? new (factories.workspace(RemoteWorkspaceImpl))() : new RemoteWorkspaceImpl());
-    const allRemotes = [logger, tracer, telemetry, client, remoteWindow, workspace];
+    const languages = (factories && factories.languages ? new (factories.languages(LanguagesImpl))() : new LanguagesImpl());
+    const allRemotes = [logger, tracer, telemetry, client, remoteWindow, workspace, languages];
     function asPromise(value) {
         if (value instanceof Promise) {
             return value;
@@ -6914,6 +7131,7 @@ function _createConnection(input, output, strategy, factories) {
         get client() { return client; },
         get window() { return remoteWindow; },
         get workspace() { return workspace; },
+        get languages() { return languages; },
         onDidChangeConfiguration: (handler) => connection.onNotification(vscode_languageserver_protocol_1.DidChangeConfigurationNotification.type, handler),
         onDidChangeWatchedFiles: (handler) => connection.onNotification(vscode_languageserver_protocol_1.DidChangeWatchedFilesNotification.type, handler),
         __textDocumentSync: undefined,
@@ -6964,24 +7182,30 @@ function _createConnection(input, output, strategy, factories) {
         onCodeLens: (handler) => connection.onRequest(vscode_languageserver_protocol_1.CodeLensRequest.type, (params, cancel) => {
             return handler(params, cancel, progress_1.attachWorkDone(connection, params), progress_1.attachPartialResult(connection, params));
         }),
-        onCodeLensResolve: (handler) => connection.onRequest(vscode_languageserver_protocol_1.CodeLensResolveRequest.type, handler),
+        onCodeLensResolve: (handler) => connection.onRequest(vscode_languageserver_protocol_1.CodeLensResolveRequest.type, (params, cancel) => {
+            return handler(params, cancel);
+        }),
         onDocumentFormatting: (handler) => connection.onRequest(vscode_languageserver_protocol_1.DocumentFormattingRequest.type, (params, cancel) => {
             return handler(params, cancel, progress_1.attachWorkDone(connection, params), undefined);
         }),
         onDocumentRangeFormatting: (handler) => connection.onRequest(vscode_languageserver_protocol_1.DocumentRangeFormattingRequest.type, (params, cancel) => {
             return handler(params, cancel, progress_1.attachWorkDone(connection, params), undefined);
         }),
-        onDocumentOnTypeFormatting: (handler) => connection.onRequest(vscode_languageserver_protocol_1.DocumentOnTypeFormattingRequest.type, handler),
+        onDocumentOnTypeFormatting: (handler) => connection.onRequest(vscode_languageserver_protocol_1.DocumentOnTypeFormattingRequest.type, (params, cancel) => {
+            return handler(params, cancel);
+        }),
         onRenameRequest: (handler) => connection.onRequest(vscode_languageserver_protocol_1.RenameRequest.type, (params, cancel) => {
             return handler(params, cancel, progress_1.attachWorkDone(connection, params), undefined);
         }),
         onPrepareRename: (handler) => connection.onRequest(vscode_languageserver_protocol_1.PrepareRenameRequest.type, (params, cancel) => {
-            return handler(params, cancel, progress_1.attachWorkDone(connection, params), undefined);
+            return handler(params, cancel);
         }),
         onDocumentLinks: (handler) => connection.onRequest(vscode_languageserver_protocol_1.DocumentLinkRequest.type, (params, cancel) => {
             return handler(params, cancel, progress_1.attachWorkDone(connection, params), progress_1.attachPartialResult(connection, params));
         }),
-        onDocumentLinkResolve: (handler) => connection.onRequest(vscode_languageserver_protocol_1.DocumentLinkResolveRequest.type, handler),
+        onDocumentLinkResolve: (handler) => connection.onRequest(vscode_languageserver_protocol_1.DocumentLinkResolveRequest.type, (params, cancel) => {
+            return handler(params, cancel);
+        }),
         onDocumentColor: (handler) => connection.onRequest(vscode_languageserver_protocol_1.DocumentColorRequest.type, (params, cancel) => {
             return handler(params, cancel, progress_1.attachWorkDone(connection, params), progress_1.attachPartialResult(connection, params));
         }),
@@ -7088,16 +7312,20 @@ function _createConnection(input, output, strategy, factories) {
     return protocolConnection;
 }
 // Export the protocol currently in proposed state.
+const callHierarchy_proposed_1 = __webpack_require__(48);
+const st = __webpack_require__(49);
 var ProposedFeatures;
 (function (ProposedFeatures) {
     ProposedFeatures.all = {
-        __brand: 'features'
+        __brand: 'features',
+        languages: combineLanguagesFeatures(callHierarchy_proposed_1.CallHierarchyFeature, st.SemanticTokensFeature)
     };
+    ProposedFeatures.SemanticTokensBuilder = st.SemanticTokensBuilder;
 })(ProposedFeatures = exports.ProposedFeatures || (exports.ProposedFeatures = {}));
 //# sourceMappingURL=main.js.map
 
 /***/ }),
-/* 38 */
+/* 40 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -7108,7 +7336,7 @@ var ProposedFeatures;
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_languageserver_protocol_1 = __webpack_require__(4);
-const Is = __webpack_require__(39);
+const Is = __webpack_require__(41);
 exports.ConfigurationFeature = (Base) => {
     return class extends Base {
         getConfiguration(arg) {
@@ -7135,7 +7363,7 @@ exports.ConfigurationFeature = (Base) => {
 //# sourceMappingURL=configuration.js.map
 
 /***/ }),
-/* 39 */
+/* 41 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -7184,7 +7412,7 @@ exports.thenable = thenable;
 //# sourceMappingURL=is.js.map
 
 /***/ }),
-/* 40 */
+/* 42 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -7223,7 +7451,7 @@ exports.WorkspaceFoldersFeature = (Base) => {
 //# sourceMappingURL=workspaceFolders.js.map
 
 /***/ }),
-/* 41 */
+/* 43 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -7234,7 +7462,7 @@ exports.WorkspaceFoldersFeature = (Base) => {
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const vscode_languageserver_protocol_1 = __webpack_require__(4);
-const uuid_1 = __webpack_require__(42);
+const uuid_1 = __webpack_require__(44);
 class WorkDoneProgressImpl {
     constructor(_connection, _token) {
         this._connection = _connection;
@@ -7306,8 +7534,8 @@ exports.attachWorkDone = attachWorkDone;
 exports.ProgressFeature = (Base) => {
     return class extends Base {
         initialize(capabilities) {
-            var _a, _b;
-            if (((_b = (_a = capabilities) === null || _a === void 0 ? void 0 : _a.window) === null || _b === void 0 ? void 0 : _b.workDoneProgress) === true) {
+            var _a;
+            if (((_a = capabilities === null || capabilities === void 0 ? void 0 : capabilities.window) === null || _a === void 0 ? void 0 : _a.workDoneProgress) === true) {
                 this._progressSupported = true;
                 this.connection.onNotification(vscode_languageserver_protocol_1.WorkDoneProgressCancelNotification.type, (params) => {
                     let progress = WorkDoneProgressImpl.Instances.get(params.token);
@@ -7364,7 +7592,7 @@ exports.attachPartialResult = attachPartialResult;
 //# sourceMappingURL=progress.js.map
 
 /***/ }),
-/* 42 */
+/* 44 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -7467,7 +7695,7 @@ exports.generateUuid = generateUuid;
 //# sourceMappingURL=uuid.js.map
 
 /***/ }),
-/* 43 */
+/* 45 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -7477,10 +7705,10 @@ exports.generateUuid = generateUuid;
  * ------------------------------------------------------------------------------------------ */
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const url = __webpack_require__(44);
+const url = __webpack_require__(46);
 const path = __webpack_require__(3);
 const fs = __webpack_require__(2);
-const child_process_1 = __webpack_require__(45);
+const child_process_1 = __webpack_require__(47);
 /**
  * @deprecated Use the `vscode-uri` npm module which provides a more
  * complete implementation of handling VS Code URIs.
@@ -7736,19 +7964,189 @@ exports.resolveModulePath = resolveModulePath;
 /* WEBPACK VAR INJECTION */}.call(this, "/index.js"))
 
 /***/ }),
-/* 44 */
+/* 46 */
 /***/ (function(module, exports) {
 
 module.exports = require("url");
 
 /***/ }),
-/* 45 */
+/* 47 */
 /***/ (function(module, exports) {
 
 module.exports = require("child_process");
 
 /***/ }),
-/* 46 */
+/* 48 */
+/***/ (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_languageserver_protocol_1 = __webpack_require__(4);
+exports.CallHierarchyFeature = (Base) => {
+    return class extends Base {
+        get callHierarchy() {
+            return {
+                onPrepare: (handler) => {
+                    this.connection.onRequest(vscode_languageserver_protocol_1.Proposed.CallHierarchyPrepareRequest.type, (params, cancel) => {
+                        return handler(params, cancel, this.attachWorkDoneProgress(params), undefined);
+                    });
+                },
+                onIncomingCalls: (handler) => {
+                    const type = vscode_languageserver_protocol_1.Proposed.CallHierarchyIncomingCallsRequest.type;
+                    this.connection.onRequest(type, (params, cancel) => {
+                        return handler(params, cancel, this.attachWorkDoneProgress(params), this.attachPartialResultProgress(type, params));
+                    });
+                },
+                onOutgoingCalls: (handler) => {
+                    const type = vscode_languageserver_protocol_1.Proposed.CallHierarchyOutgoingCallsRequest.type;
+                    this.connection.onRequest(type, (params, cancel) => {
+                        return handler(params, cancel, this.attachWorkDoneProgress(params), this.attachPartialResultProgress(type, params));
+                    });
+                }
+            };
+        }
+    };
+};
+//# sourceMappingURL=callHierarchy.proposed.js.map
+
+/***/ }),
+/* 49 */
+/***/ (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_languageserver_protocol_1 = __webpack_require__(4);
+exports.SemanticTokensFeature = (Base) => {
+    return class extends Base {
+        get semanticTokens() {
+            return {
+                on: (handler) => {
+                    const type = vscode_languageserver_protocol_1.Proposed.SemanticTokensRequest.type;
+                    this.connection.onRequest(type, (params, cancel) => {
+                        return handler(params, cancel, this.attachWorkDoneProgress(params), this.attachPartialResultProgress(type, params));
+                    });
+                },
+                onEdits: (handler) => {
+                    const type = vscode_languageserver_protocol_1.Proposed.SemanticTokensEditsRequest.type;
+                    this.connection.onRequest(type, (params, cancel) => {
+                        return handler(params, cancel, this.attachWorkDoneProgress(params), this.attachPartialResultProgress(type, params));
+                    });
+                },
+                onRange: (handler) => {
+                    const type = vscode_languageserver_protocol_1.Proposed.SemanticTokensRangeRequest.type;
+                    this.connection.onRequest(type, (params, cancel) => {
+                        return handler(params, cancel, this.attachWorkDoneProgress(params), this.attachPartialResultProgress(type, params));
+                    });
+                }
+            };
+        }
+    };
+};
+class SemanticTokensBuilder {
+    constructor() {
+        this._prevData = undefined;
+        this.initialize();
+    }
+    initialize() {
+        this._id = Date.now();
+        this._prevLine = 0;
+        this._prevChar = 0;
+        this._data = [];
+        this._dataLen = 0;
+    }
+    push(line, char, length, tokenType, tokenModifiers) {
+        let pushLine = line;
+        let pushChar = char;
+        if (this._dataLen > 0) {
+            pushLine -= this._prevLine;
+            if (pushLine === 0) {
+                pushChar -= this._prevChar;
+            }
+        }
+        this._data[this._dataLen++] = pushLine;
+        this._data[this._dataLen++] = pushChar;
+        this._data[this._dataLen++] = length;
+        this._data[this._dataLen++] = tokenType;
+        this._data[this._dataLen++] = tokenModifiers;
+        this._prevLine = line;
+        this._prevChar = char;
+    }
+    get id() {
+        return this._id.toString();
+    }
+    previousResult(id) {
+        if (this.id === id) {
+            this._prevData = this._data;
+        }
+        this.initialize();
+    }
+    build() {
+        this._prevData = undefined;
+        return {
+            resultId: this.id,
+            data: this._data
+        };
+    }
+    canBuildEdits() {
+        return this._prevData !== undefined;
+    }
+    buildEdits() {
+        if (this._prevData !== undefined) {
+            const prevDataLength = this._prevData.length;
+            const dataLength = this._data.length;
+            let startIndex = 0;
+            while (startIndex < dataLength && startIndex < prevDataLength && this._prevData[startIndex] === this._data[startIndex]) {
+                startIndex++;
+            }
+            if (startIndex < dataLength && startIndex < prevDataLength) {
+                // Find end index
+                let endIndex = 0;
+                while (endIndex < dataLength && endIndex < prevDataLength && this._prevData[prevDataLength - 1 - endIndex] === this._data[dataLength - 1 - endIndex]) {
+                    endIndex++;
+                }
+                const newData = this._data.slice(startIndex, dataLength - endIndex);
+                const result = {
+                    resultId: this.id,
+                    edits: [
+                        { start: startIndex, deleteCount: prevDataLength - endIndex - startIndex, data: newData }
+                    ]
+                };
+                return result;
+            }
+            else if (startIndex < dataLength) {
+                return { resultId: this.id, edits: [
+                        { start: startIndex, deleteCount: 0, data: this._data.slice(startIndex) }
+                    ] };
+            }
+            else if (startIndex < prevDataLength) {
+                return { resultId: this.id, edits: [
+                        { start: startIndex, deleteCount: prevDataLength - startIndex }
+                    ] };
+            }
+            else {
+                return { resultId: this.id, edits: [] };
+            }
+        }
+        else {
+            return this.build();
+        }
+    }
+}
+exports.SemanticTokensBuilder = SemanticTokensBuilder;
+//# sourceMappingURL=sematicTokens.proposed.js.map
+
+/***/ }),
+/* 50 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8353,7 +8751,7 @@ function _asFormatted(uri, skipEncoding) {
 
 
 /***/ }),
-/* 47 */
+/* 51 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -8385,7 +8783,7 @@ var DirectoryItem;
 
 
 /***/ }),
-/* 48 */
+/* 52 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -8402,10 +8800,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(__webpack_require__(3));
-const fast_diff_1 = __importDefault(__webpack_require__(49));
-const types_1 = __webpack_require__(47);
-const vscode_uri_1 = __webpack_require__(46);
-const resolve_from_1 = __importDefault(__webpack_require__(50));
+const fast_diff_1 = __importDefault(__webpack_require__(53));
+const types_1 = __webpack_require__(51);
+const vscode_uri_1 = __webpack_require__(50);
 /**
  * Check if the path follows this pattern: `\\hostname\sharename`.
  *
@@ -8478,7 +8875,10 @@ function getAllFixEdits(document, settings) {
     if (uri.scheme != 'file')
         return [];
     const content = document.getText();
-    const newOptions = Object.assign(Object.assign({}, settings.options), { fix: true });
+    const fixRule = (problem) => {
+        return settings.autoFixSkipRules.indexOf(problem.ruleId) === -1;
+    };
+    const newOptions = Object.assign(Object.assign({}, settings.options), { fix: fixRule });
     return executeInWorkspaceDirectory(document, settings, newOptions, (filename, options) => {
         if (!settings.validate) {
             return [];
@@ -8535,21 +8935,6 @@ function getChange(oldStr, newStr) {
     return { start, end, newText };
 }
 exports.getChange = getChange;
-function resolveModule(name, localPath, globalPath) {
-    if (localPath) {
-        let path = resolve_from_1.default.silent(localPath, name);
-        if (path)
-            return Promise.resolve(path);
-    }
-    try {
-        let path = resolve_from_1.default(globalPath, name);
-        return Promise.resolve(path);
-    }
-    catch (e) {
-        return Promise.reject(e);
-    }
-}
-exports.resolveModule = resolveModule;
 function executeInWorkspaceDirectory(document, settings, newOptions, callback) {
     const filename = getFilePath(document);
     const cwd = process.cwd();
@@ -8586,7 +8971,7 @@ exports.executeInWorkspaceDirectory = executeInWorkspaceDirectory;
 
 
 /***/ }),
-/* 49 */
+/* 53 */
 /***/ (function(module, exports) {
 
 /**
@@ -9366,67 +9751,7 @@ module.exports = diff;
 
 
 /***/ }),
-/* 50 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const path = __webpack_require__(3);
-const Module = __webpack_require__(51);
-const fs = __webpack_require__(2);
-
-const resolveFrom = (fromDirectory, moduleId, silent) => {
-	if (typeof fromDirectory !== 'string') {
-		throw new TypeError(`Expected \`fromDir\` to be of type \`string\`, got \`${typeof fromDirectory}\``);
-	}
-
-	if (typeof moduleId !== 'string') {
-		throw new TypeError(`Expected \`moduleId\` to be of type \`string\`, got \`${typeof moduleId}\``);
-	}
-
-	try {
-		fromDirectory = fs.realpathSync(fromDirectory);
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			fromDirectory = path.resolve(fromDirectory);
-		} else if (silent) {
-			return;
-		} else {
-			throw error;
-		}
-	}
-
-	const fromFile = path.join(fromDirectory, 'noop.js');
-
-	const resolveFileName = () => Module._resolveFilename(moduleId, {
-		id: fromFile,
-		filename: fromFile,
-		paths: Module._nodeModulePaths(fromDirectory)
-	});
-
-	if (silent) {
-		try {
-			return resolveFileName();
-		} catch (error) {
-			return;
-		}
-	}
-
-	return resolveFileName();
-};
-
-module.exports = (fromDirectory, moduleId) => resolveFrom(fromDirectory, moduleId);
-module.exports.silent = (fromDirectory, moduleId) => resolveFrom(fromDirectory, moduleId, true);
-
-
-/***/ }),
-/* 51 */
-/***/ (function(module, exports) {
-
-module.exports = require("module");
-
-/***/ }),
-/* 52 */
+/* 54 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";