Skip to content

Commit 63b8404

Browse files
adopt new createStatusBarItem API for id and name properties (#1054)
1 parent e60a8f4 commit 63b8404

File tree

6 files changed

+25
-20
lines changed

6 files changed

+25
-20
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"debugger"
2222
],
2323
"engines": {
24-
"vscode": "^1.55.0"
24+
"vscode": "^1.57.0"
2525
},
2626
"license": "SEE LICENSE IN LICENSE.txt",
2727
"repository": {
@@ -946,7 +946,7 @@
946946
"@types/mocha": "^5.2.7",
947947
"@types/node": "^14.14.10",
948948
"@types/uuid": "^8.3.0",
949-
"@types/vscode": "1.55.0",
949+
"@types/vscode": "1.57.0",
950950
"cross-env": "^5.2.0",
951951
"gulp": "^4.0.2",
952952
"gulp-tslint": "^8.1.4",

src/JavaInlineValueProvider.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

4-
import * as compareVersions from "compare-versions";
54
import { debug, InlineValue, InlineValueContext, InlineValueEvaluatableExpression, InlineValuesProvider, InlineValueText, InlineValueVariableLookup,
6-
Range, TextDocument, version } from "vscode";
5+
Range, TextDocument } from "vscode";
76
import { instrumentOperation, instrumentOperationStep, sendInfo } from "vscode-extension-telemetry-wrapper";
87
import * as CodeConverter from "vscode-languageclient/lib/codeConverter";
98
import * as ProtocolConverter from "vscode-languageclient/lib/protocolConverter";
109
import { InlineKind, InlineVariable, resolveInlineVariables } from "./languageServerPlugin";
1110

12-
// In VS Code 1.55.0, viewport doesn't change while scrolling the editor and it's fixed in 1.56.0.
13-
// So dynamically enable viewport support based on the user's VS Code version.
14-
const isViewPortSupported = compareVersions(version.replace(/-insider$/i, ""), "1.56.0") >= 0;
15-
1611
const protoConverter: ProtocolConverter.Converter = ProtocolConverter.createConverter();
1712
const codeConverter: CodeConverter.Converter = CodeConverter.createConverter();
1813

@@ -23,7 +18,7 @@ export class JavaInlineValuesProvider implements InlineValuesProvider {
2318
const resolveInlineVariablesStep = instrumentOperationStep(operationId, "resolveInlineVariables", async () => {
2419
return <InlineVariable[]> (await resolveInlineVariables({
2520
uri: document.uri.toString(),
26-
viewPort: isViewPortSupported ? codeConverter.asRange(viewPort) : undefined,
21+
viewPort: codeConverter.asRange(viewPort),
2722
stoppedLocation: codeConverter.asRange(context.stoppedLocation),
2823
}));
2924
});

src/customWidget.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ export class NotificationBar implements vscode.Disposable {
77
private statusBar: vscode.StatusBarItem;
88
private lastUpdateTime: number;
99

10-
constructor() {
11-
this.statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, Number.POSITIVE_INFINITY);
10+
constructor(id: string, name: string) {
11+
this.statusBar = vscode.window.createStatusBarItem(id, vscode.StatusBarAlignment.Left, Number.POSITIVE_INFINITY);
12+
this.statusBar.name = name;
1213
}
1314

1415
public show(text: string, duration?: number) {

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function initializeExtension(_operationId: string, context: vscode.ExtensionCont
5555
// tslint:disable-next-line
5656
return javaProcess ? String(javaProcess.pid) : "${command:PickJavaProcess}";
5757
}));
58-
const hcrStatusBar: NotificationBar = new NotificationBar();
58+
const hcrStatusBar: NotificationBar = new NotificationBar("java.hcrStatusBar", "Java HotCodeReplace");
5959
context.subscriptions.push(hcrStatusBar);
6060
context.subscriptions.push(instrumentOperationAsVsCodeCommand("java.debug.hotCodeReplace", async () => {
6161
await applyHCR(hcrStatusBar);

src/progressImpl.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ class ProgressReporter implements IProgressReporter {
3333
}
3434

3535
if (this._progressLocation === ProgressLocation.Window) {
36-
this._statusBarItem = window.createStatusBarItem(StatusBarAlignment.Left, 1);
36+
this._statusBarItem = window.createStatusBarItem(this._id, StatusBarAlignment.Left, 1);
37+
this._statusBarItem.name = "Progress Message for " + this._jobName;
3738
this._statusBarItem.text = `$(sync~spin) ${this._jobName}...`;
3839
this._statusBarItem.command = {
3940
title: "Check Java Build Status",

0 commit comments

Comments
 (0)