Merge pull request #137 from elm-tooling/new-lsp-version

Author: razzeee

.github/workflows/compile.yaml

@@ -1,6 +1,12 @@
 name: Compile
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:

client/package-lock.json

@@ -17,7 +17,7 @@
     "lint": "eslint -c .eslintrc.js --ext .ts src"
   },
   "dependencies": {
-    "vscode-languageclient": "^6.1.3"
+    "vscode-languageclient": "^7.0.0-next.14"
   },
   "devDependencies": {
     "@types/request": "^2.48.5",

client/package.json

@@ -1,4 +1,4 @@
-import { LanguageClient } from "vscode-languageclient";
+import { LanguageClient } from "vscode-languageclient/node";
 import { ExtensionContext, commands } from "vscode";
 import {
   ExposeRequest,

client/src/exposeUnexposeAction.ts

@@ -15,15 +15,18 @@ import {
   WorkspaceFolder,
 } from "vscode";
 import {
-  LanguageClient,
   LanguageClientOptions,
   Middleware,
   ResolveCodeLensSignature,
   RevealOutputChannelOn,
-  TransportKind,
   ProvideCodeLensesSignature,
   DidChangeConfigurationNotification,
 } from "vscode-languageclient";
+import {
+  LanguageClient,
+  ServerOptions,
+  TransportKind,
+} from "vscode-languageclient/node";
 import * as Package from "./elmPackage";
 import * as RefactorAction from "./refactorAction";
 import * as ExposeUnexposeAction from "./exposeUnexposeAction";
@@ -114,13 +117,16 @@ export function activate(context: ExtensionContext): void {
       const debugOptions = {
         execArgv: ["--nolazy", `--inspect=${6010 + clients.size}`],
       };
-      const serverOptions = {
+      const serverOptions: ServerOptions = {
         debug: {
           module,
           options: debugOptions,
           transport: TransportKind.ipc,
         },
-        run: { module, transport: TransportKind.ipc },
+        run: {
+          module,
+          transport: TransportKind.ipc,
+        },
       };
       const clientOptions: LanguageClientOptions = {
         diagnosticCollectionName: "Elm",

client/src/extension.ts

@@ -4,13 +4,10 @@ import { CodeActionParams, RequestType } from "vscode-languageclient";
 export const GetMoveDestinationRequest = new RequestType<
   IMoveParams,
   IMoveDestinationsResponse,
-  void,
   void
 >("elm/getMoveDestinations");
 
-export const MoveRequest = new RequestType<IMoveParams, void, void, void>(
-  "elm/move",
-);
+export const MoveRequest = new RequestType<IMoveParams, void, void>("elm/move");
 
 export interface IMoveParams {
   sourceUri: string;
@@ -28,12 +25,9 @@ export interface IMoveDestination {
   uri: string;
 }
 
-export const ExposeRequest = new RequestType<
-  IExposeUnexposeParams,
-  void,
-  void,
-  void
->("elm/expose");
+export const ExposeRequest = new RequestType<IExposeUnexposeParams, void, void>(
+  "elm/expose",
+);
 
 export interface IExposeUnexposeParams {
   uri: string;
@@ -43,7 +37,6 @@ export interface IExposeUnexposeParams {
 export const UnexposeRequest = new RequestType<
   IExposeUnexposeParams,
   void,
-  void,
   void
 >("elm/unexpose");
 
@@ -54,13 +47,11 @@ export interface IOnDidCreateFilesParams {
 export const OnDidCreateFilesRequest = new RequestType<
   FileCreateEvent,
   void,
-  void,
   void
 >("elm/ondidCreateFiles");
 
 export const OnDidRenameFilesRequest = new RequestType<
   FileRenameEvent,
   void,
-  void,
   void
 >("elm/ondidRenameFiles");

client/src/protocol.ts

@@ -1,5 +1,6 @@
 import { commands, ExtensionContext, window } from "vscode";
-import { CodeActionParams, LanguageClient } from "vscode-languageclient";
+import { CodeActionParams } from "vscode-languageclient";
+import { LanguageClient } from "vscode-languageclient/node";
 import { GetMoveDestinationRequest, MoveRequest } from "./protocol";
 
 export function registerCommands(

client/src/refactorAction.ts

@@ -1,6 +1,6 @@
 "use strict";
 import * as vscode from "vscode";
-import { LanguageClient } from "vscode-languageclient";
+import { LanguageClient } from "vscode-languageclient/node";
 
 export function registerCommand(
   langClients: Map<string, LanguageClient>,