Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/compile.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: Compile

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
Expand Down
30 changes: 15 additions & 15 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion client/src/exposeUnexposeAction.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LanguageClient } from "vscode-languageclient";
import { LanguageClient } from "vscode-languageclient/node";
import { ExtensionContext, commands } from "vscode";
import {
ExposeRequest,
Expand Down
14 changes: 10 additions & 4 deletions client/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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",
Expand Down
17 changes: 4 additions & 13 deletions client/src/protocol.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -43,7 +37,6 @@ export interface IExposeUnexposeParams {
export const UnexposeRequest = new RequestType<
IExposeUnexposeParams,
void,
void,
void
>("elm/unexpose");

Expand All @@ -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");
3 changes: 2 additions & 1 deletion client/src/refactorAction.ts
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion client/src/restart.ts
Original file line number Diff line number Diff line change
@@ -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>,
Expand Down
2 changes: 1 addition & 1 deletion server
Submodule server updated 1 files
+0 −1 README.md