Skip to content

Commit 97df4da

Browse files
authored
api: finalize windowActivity (microsoft#210491)
Closes microsoft#181569
1 parent 21c6684 commit 97df4da

File tree

6 files changed

+13
-29
lines changed

6 files changed

+13
-29
lines changed

extensions/vscode-api-tests/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
"treeViewActiveItem",
5353
"treeViewReveal",
5454
"workspaceTrust",
55-
"telemetry",
56-
"windowActivity"
55+
"telemetry"
5756
],
5857
"private": true,
5958
"activationEvents": [],

src/vs/workbench/api/common/extHost.api.impl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
749749
return _asExtensionEvent(extHostTerminalShellIntegration.onDidEndTerminalShellExecution)(listener, thisArg, disposables);
750750
},
751751
get state() {
752-
return extHostWindow.getState(extension);
752+
return extHostWindow.getState();
753753
},
754754
onDidChangeWindowState(listener, thisArg?, disposables?) {
755755
return _asExtensionEvent(extHostWindow.onDidChangeWindowState)(listener, thisArg, disposables);

src/vs/workbench/api/common/extHostWindow.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { Event, Emitter } from 'vs/base/common/event';
7-
import { ExtHostWindowShape, MainContext, MainThreadWindowShape, IOpenUriOptions } from './extHost.protocol';
8-
import { WindowState } from 'vscode';
9-
import { URI } from 'vs/base/common/uri';
6+
import { Emitter, Event } from 'vs/base/common/event';
107
import { Schemas } from 'vs/base/common/network';
118
import { isFalsyOrWhitespace } from 'vs/base/common/strings';
9+
import { URI } from 'vs/base/common/uri';
1210
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1311
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
14-
import { IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
15-
import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
12+
import { WindowState } from 'vscode';
13+
import { ExtHostWindowShape, IOpenUriOptions, MainContext, MainThreadWindowShape } from './extHost.protocol';
1614

1715
export class ExtHostWindow implements ExtHostWindowShape {
1816

@@ -28,7 +26,7 @@ export class ExtHostWindow implements ExtHostWindowShape {
2826

2927
private _state = ExtHostWindow.InitialState;
3028

31-
getState(extension: Readonly<IRelaxedExtensionDescription>): WindowState {
29+
getState(): WindowState {
3230
// todo@connor4312: this can be changed to just return this._state after proposed api is finalized
3331
const state = this._state;
3432

@@ -37,7 +35,6 @@ export class ExtHostWindow implements ExtHostWindowShape {
3735
return state.focused;
3836
},
3937
get active() {
40-
checkProposedApiEnabled(extension, 'windowActivity');
4138
return state.active;
4239
},
4340
};

src/vs/workbench/services/extensions/common/extensionsApiProposals.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ export const allApiProposals = Object.freeze({
122122
treeViewReveal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewReveal.d.ts',
123123
tunnelFactory: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnelFactory.d.ts',
124124
tunnels: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnels.d.ts',
125-
windowActivity: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.windowActivity.d.ts',
126125
workspaceTrust: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts'
127126
});
128127
export type ApiProposalName = keyof typeof allApiProposals;

src/vscode-dts/vscode.d.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10299,6 +10299,12 @@ declare module 'vscode' {
1029910299
* Whether the current window is focused.
1030010300
*/
1030110301
readonly focused: boolean;
10302+
10303+
/**
10304+
* Whether the window has been interacted with recently. This will change
10305+
* immediately on activity, or after a short time of user inactivity.
10306+
*/
10307+
readonly active: boolean;
1030210308
}
1030310309

1030410310
/**

src/vscode-dts/vscode.proposed.windowActivity.d.ts

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)