Skip to content

Commit f457b70

Browse files
committed
final init order fixes #243049
1 parent 15b4e53 commit f457b70

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

build/lib/propertyInitOrderChecker.js

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

build/lib/propertyInitOrderChecker.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ const TS_CONFIG_PATH = path.join(__dirname, '../../', 'src', 'tsconfig.json');
2222
// #############################################################################################
2323
//
2424

25-
const ignored = new Set([
26-
'vs/editor/browser/view/viewLayer.ts',
27-
'vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts',
28-
'vs/editor/contrib/inlayHints/browser/inlayHintsController.ts',
29-
'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
30-
'vs/workbench/api/common/extHostLanguageFeatures.ts',
31-
]);
3225

3326
const cancellationToken: ts.CancellationToken = {
3427
isCancellationRequested: () => false,
@@ -59,12 +52,6 @@ for (const file of program.getSourceFiles()) {
5952
if (!file || file.isDeclarationFile) {
6053
continue;
6154
}
62-
63-
const relativePath = path.relative(path.dirname(TS_CONFIG_PATH), file.fileName).replace(/\\/g, '/');
64-
if (ignored.has(relativePath)) {
65-
continue;
66-
}
67-
6855
visit(file);
6956
}
7057

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1335,14 +1335,15 @@ class InlineCompletionAdapter {
13351335
items: readonly vscode.InlineCompletionItem[];
13361336
}>();
13371337

1338-
private readonly _isAdditionsProposedApiEnabled = isProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
1338+
private readonly _isAdditionsProposedApiEnabled: boolean;
13391339

13401340
constructor(
13411341
private readonly _extension: IExtensionDescription,
13421342
private readonly _documents: ExtHostDocuments,
13431343
private readonly _provider: vscode.InlineCompletionItemProvider,
13441344
private readonly _commands: CommandsConverter,
13451345
) {
1346+
this._isAdditionsProposedApiEnabled = isProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
13461347
}
13471348

13481349
public get supportsHandleEvents(): boolean {

src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
3535

3636
public readonly SIZE_LIMIT = Math.floor(1024 * 1024 * 1.9); // 2 MB
3737

38-
private serverConfiguration = this.productService['editSessions.store'];
38+
private serverConfiguration;
3939
private machineClient: IUserDataSyncMachinesService | undefined;
4040

4141
private authenticationInfo: { sessionId: string; token: string; providerId: string } | undefined;
@@ -84,7 +84,7 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
8484
@ISecretStorageService private readonly secretStorageService: ISecretStorageService
8585
) {
8686
super();
87-
87+
this.serverConfiguration = this.productService['editSessions.store'];
8888
// If the user signs out of the current session, reset our cached auth state in memory and on disk
8989
this._register(this.authenticationService.onDidChangeSessions((e) => this.onDidChangeSessions(e.event)));
9090

0 commit comments

Comments
 (0)