Skip to content

Commit 0a2e314

Browse files
fix(deps): remove unused vscode-languageclient (#1682)
* chore(deps): bump vscode-languageclient from 6.0.0-next.9 to 10.1.0 Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 6.0.0-next.9 to 10.1.0. - [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases) - [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.1.0/client) --- updated-dependencies: - dependency-name: vscode-languageclient dependency-version: 10.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: migrate inline value range conversion Replace private vscode-languageclient converter imports that are no longer exported in v10 and cover the equivalent range conversion behavior. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(deps): remove unused vscode-languageclient The inline range conversion no longer relies on vscode-languageclient, leaving no runtime, build, test, type, or configuration usage. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent d4e1bb7 commit 0a2e314

4 files changed

Lines changed: 37 additions & 91 deletions

File tree

package-lock.json

Lines changed: 0 additions & 80 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,6 @@
14021402
"dotenv": "^17.4.2",
14031403
"lodash": "^4.18.0",
14041404
"vscode-extension-telemetry-wrapper": "^0.15.3",
1405-
"vscode-languageclient": "6.0.0-next.9",
14061405
"vscode-languageserver-types": "3.18.0",
14071406
"vscode-tas-client": "^0.1.84"
14081407
},

src/JavaInlineValueProvider.ts

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@
44
import { debug, InlineValue, InlineValueContext, InlineValueEvaluatableExpression, InlineValuesProvider, InlineValueText, InlineValueVariableLookup,
55
Range, TextDocument } from "vscode";
66
import { instrumentOperation, instrumentOperationStep, sendInfo } from "vscode-extension-telemetry-wrapper";
7-
import * as CodeConverter from "vscode-languageclient/lib/codeConverter";
8-
import * as ProtocolConverter from "vscode-languageclient/lib/protocolConverter";
7+
import { Range as ProtocolRange } from "vscode-languageserver-types";
98
import { InlineKind, InlineVariable, resolveInlineVariables } from "./languageServerPlugin";
109

11-
const protoConverter: ProtocolConverter.Converter = ProtocolConverter.createConverter();
12-
const codeConverter: CodeConverter.Converter = CodeConverter.createConverter();
10+
export function toProtocolRange(range: Range): ProtocolRange {
11+
return {
12+
start: { line: range.start.line, character: range.start.character },
13+
end: { line: range.end.line, character: range.end.character },
14+
};
15+
}
16+
17+
export function toCodeRange(range: ProtocolRange): Range {
18+
return new Range(range.start.line, range.start.character, range.end.line, range.end.character);
19+
}
1320

1421
export class JavaInlineValuesProvider implements InlineValuesProvider {
1522

@@ -18,8 +25,8 @@ export class JavaInlineValuesProvider implements InlineValuesProvider {
1825
const resolveInlineVariablesStep = instrumentOperationStep(operationId, "resolveInlineVariables", async () => {
1926
return <InlineVariable[]> (await resolveInlineVariables({
2027
uri: document.uri.toString(),
21-
viewPort: codeConverter.asRange(viewPort),
22-
stoppedLocation: codeConverter.asRange(context.stoppedLocation),
28+
viewPort: toProtocolRange(viewPort),
29+
stoppedLocation: toProtocolRange(context.stoppedLocation),
2330
}));
2431
});
2532
const variables: InlineVariable[] = await resolveInlineVariablesStep();
@@ -57,16 +64,16 @@ export class JavaInlineValuesProvider implements InlineValuesProvider {
5764
let next = 0;
5865
for (const variable of variables) {
5966
if (variable.kind === InlineKind.VariableLookup) {
60-
result.push(new InlineValueVariableLookup(protoConverter.asRange(variable.range), variable.name, true));
67+
result.push(new InlineValueVariableLookup(toCodeRange(variable.range), variable.name, true));
6168
} else if (resolvedVariables && resolvedVariables.length > next) {
6269
const resolvedValue = resolvedVariables[next++];
6370
if (resolvedValue) {
64-
result.push(new InlineValueText(protoConverter.asRange(variable.range), `${variable.name} = ${resolvedValue.value}`));
71+
result.push(new InlineValueText(toCodeRange(variable.range), `${variable.name} = ${resolvedValue.value}`));
6572
} else {
66-
result.push(new InlineValueEvaluatableExpression(protoConverter.asRange(variable.range), variable.name));
73+
result.push(new InlineValueEvaluatableExpression(toCodeRange(variable.range), variable.name));
6774
}
6875
} else {
69-
result.push(new InlineValueEvaluatableExpression(protoConverter.asRange(variable.range), variable.name));
76+
result.push(new InlineValueEvaluatableExpression(toCodeRange(variable.range), variable.name));
7077
}
7178
}
7279

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
3+
4+
import * as assert from "assert";
5+
import { Range } from "vscode";
6+
7+
import { toCodeRange, toProtocolRange } from "../src/JavaInlineValueProvider";
8+
9+
suite("JavaInlineValueProvider", () => {
10+
test("converts ranges without relying on language client internals", () => {
11+
const codeRange = new Range(1, 2, 3, 4);
12+
const protocolRange = toProtocolRange(codeRange);
13+
14+
assert.deepStrictEqual(protocolRange, {
15+
start: { line: 1, character: 2 },
16+
end: { line: 3, character: 4 },
17+
});
18+
assert.ok(toCodeRange(protocolRange).isEqual(codeRange));
19+
});
20+
});

0 commit comments

Comments
 (0)