Skip to content
This repository has been archived by the owner on Oct 5, 2022. It is now read-only.

Update to theia:next #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
7 changes: 5 additions & 2 deletions xtext-dsl-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
],
"dependencies": {
"@theia/core": "next",
"@theia/languages": "next"
"@theia/languages": "next",
"@theia/monaco": "next",
"monaco-editor-core": "^0.14.6",
"monaco-languageclient": "^0.9.0"
},
"devDependencies": {
"rimraf": "latest",
Expand All @@ -30,4 +33,4 @@
"backend": "lib/node/backend-extension"
}
]
}
}
9 changes: 4 additions & 5 deletions xtext-dsl-extension/src/node/backend-extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { BaseLanguageServerContribution, LanguageServerContribution, IConnection
import { createSocketConnection } from 'vscode-ws-jsonrpc/lib/server'
import * as path from 'path';
import * as net from 'net'

import { ProcessErrorEvent } from '@theia/process/lib/node/process';

export default new ContainerModule(bind => {
bind<LanguageServerContribution>(LanguageServerContribution).to(DSLContribution);
Expand Down Expand Up @@ -42,7 +42,6 @@ class DSLContribution extends BaseLanguageServerContribution {
socket.connect(socketPort)
} else {
const jar = path.resolve(__dirname, '../../build/dsl-language-server.jar');

const command = 'java';
const args: string[] = [
'-jar',
Expand All @@ -53,11 +52,11 @@ class DSLContribution extends BaseLanguageServerContribution {
}
}

protected onDidFailSpawnProcess(error: Error): void {
protected onDidFailSpawnProcess(error: ProcessErrorEvent): void {
super.onDidFailSpawnProcess(error);
console.error("Error starting DSL language server.", error)
console.error("Error starting language server.");
console.error("Please make sure it is built: cd xtext-dsl-language-server; ./gradlew shadowJar.");
}

}


Expand Down
Loading