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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,6 @@
"expand-home-dir": "0.0.3",
"find-java-home": "^1.0.0",
"glob": "^7.1.4",
"vscode-languageclient": "^5.2.1"
"vscode-languageclient": "^7.0.0"
}
}
3 changes: 2 additions & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
import { getRedHatService, TelemetryService } from '@redhat-developer/vscode-redhat-telemetry/lib';
import { RedHatService } from '@redhat-developer/vscode-redhat-telemetry/lib/interfaces/redhatService';
import { commands, ExtensionContext, extensions, window, workspace } from 'vscode';
import { DidChangeConfigurationNotification, DocumentSelector, LanguageClient, LanguageClientOptions } from 'vscode-languageclient';
import { DidChangeConfigurationNotification, DocumentSelector, LanguageClientOptions } from 'vscode-languageclient';
import { LanguageClient } from 'vscode-languageclient/node';
import * as CommandKind from './definitions/lspCommandKind';
import * as MicroProfileLS from './definitions/microProfileLSRequestNames';
import { prepareExecutable } from './languageServer/javaServerStarter';
Expand Down
3 changes: 1 addition & 2 deletions src/languageServer/javaServerStarter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as os from 'os';
import * as path from 'path';
import { workspace } from 'vscode';
import { Executable, ExecutableOptions } from 'vscode-languageclient';
import { Executable, ExecutableOptions } from 'vscode-languageclient/node';
import { RequirementsData } from './requirements';
import * as glob from 'glob';

Expand All @@ -14,7 +14,6 @@ export function prepareExecutable(requirements: RequirementsData, microprofileJa
const executable: Executable = Object.create(null);
const options: ExecutableOptions = Object.create(null);
options.env = process.env;
options.stdio = 'pipe';
executable.options = options;
executable.command = path.resolve(requirements.java_home + '/bin/java');
executable.args = prepareParams(microprofileJavaExtensions);
Expand Down
3 changes: 2 additions & 1 deletion src/yaml/YamlSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
} from "./YamlConstants";

import { Uri } from 'vscode';
import { LanguageClient } from 'vscode-languageclient';
import { LanguageClient } from 'vscode-languageclient/node';
import * as MicroProfileLS from '../definitions/microProfileLSRequestNames';

// The function signature exposed by vscode-yaml:
Expand Down Expand Up @@ -88,6 +88,7 @@ export class YamlSchemaCache {
return jsonSchema;
}, (err) => {
console.error(`Error while consumming '${MicroProfileLS.JSON_SCHEMA_FOR_PROJECT_INFO_REQUEST}' request: ${err.message}`);
return null;
});
}

Expand Down