Skip to content

Commit 5c69ec9

Browse files
mjbvzmjbvz
authored
Merge pull request microsoft#226651 from mjbvz/tall-mackerel
Pick up latest TS for building VS Code
2 parents 70071d2 + 849154e commit 5c69ec9

File tree

6 files changed

+31
-30
lines changed

6 files changed

+31
-30
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
"ts-node": "^10.9.1",
216216
"tsec": "0.2.7",
217217
"tslib": "^2.6.3",
218-
"typescript": "^5.6.0-dev.20240816",
218+
"typescript": "^5.7.0-dev.20240826",
219219
"util": "^0.12.4",
220220
"vscode-nls-dev": "^3.3.1",
221221
"webpack": "^5.91.0",

‎src/vs/editor/contrib/suggest/browser/suggest.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,13 @@ export class CompletionOptions {
178178
) { }
179179
}
180180

181-
let _snippetSuggestSupport: languages.CompletionItemProvider;
181+
let _snippetSuggestSupport: languages.CompletionItemProvider | undefined;
182182

183-
export function getSnippetSuggestSupport(): languages.CompletionItemProvider {
183+
export function getSnippetSuggestSupport(): languages.CompletionItemProvider | undefined {
184184
return _snippetSuggestSupport;
185185
}
186186

187-
export function setSnippetSuggestSupport(support: languages.CompletionItemProvider): languages.CompletionItemProvider {
187+
export function setSnippetSuggestSupport(support: languages.CompletionItemProvider | undefined): languages.CompletionItemProvider | undefined {
188188
const old = _snippetSuggestSupport;
189189
_snippetSuggestSupport = support;
190190
return old;

‎src/vs/editor/contrib/suggest/browser/suggestModel.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,10 @@ export class SuggestModel implements IDisposable {
230230
let set = supportsByTriggerCharacter.get(ch);
231231
if (!set) {
232232
set = new Set();
233-
set.add(getSnippetSuggestSupport());
233+
const suggestSupport = getSnippetSuggestSupport();
234+
if (suggestSupport) {
235+
set.add(suggestSupport);
236+
}
234237
supportsByTriggerCharacter.set(ch, set);
235238
}
236239
set.add(support);

‎src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/uti
99
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
1010
import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
1111
import { ContextKeyEqualsExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
12-
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
12+
import { TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
1313
import { IToolData, IToolImpl, IToolInvocation, LanguageModelToolsService } from '../../common/languageModelToolsService';
1414

1515
suite('LanguageModelToolsService', () => {
1616
const store = ensureNoDisposablesAreLeakedInTestSuite();
1717

18-
let extensionService: IExtensionService;
1918
let contextKeyService: IContextKeyService;
2019
let service: LanguageModelToolsService;
2120

2221
setup(() => {
22+
const extensionService = new TestExtensionService();
2323
contextKeyService = store.add(new ContextKeyService(new TestConfigurationService()));
2424
service = store.add(new LanguageModelToolsService(extensionService, contextKeyService));
2525
});

‎src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts

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

6+
import type { Terminal } from '@xterm/xterm';
67
import { strictEqual } from 'assert';
8+
import { importAMDNodeModule } from 'vs/amdX';
79
import { IAction } from 'vs/base/common/actions';
10+
import { Event } from 'vs/base/common/event';
811
import { isWindows } from 'vs/base/common/platform';
12+
import { URI } from 'vs/base/common/uri';
13+
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
14+
import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
915
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1016
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
1117
import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
1218
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
1319
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
20+
import { ILabelService } from 'vs/platform/label/common/label';
1421
import { ILogService, NullLogService } from 'vs/platform/log/common/log';
22+
import { IOpenerService } from 'vs/platform/opener/common/opener';
23+
import { IStorageService } from 'vs/platform/storage/common/storage';
1524
import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
1625
import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
1726
import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
18-
import { gitSimilar, freePort, FreePortOutputRegex, gitCreatePr, GitCreatePrOutputRegex, GitPushOutputRegex, gitPushSetUpstream, GitSimilarOutputRegex, gitTwoDashes, GitTwoDashesRegex, pwshUnixCommandNotFoundError, PwshUnixCommandNotFoundErrorOutputRegex, pwshGeneralError, PwshGeneralErrorOutputRegex, gitPull, GitPullOutputRegex } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions';
19-
import { TerminalQuickFixAddon, getQuickFixesForCommand } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon';
20-
import { URI } from 'vs/base/common/uri';
21-
import type { Terminal } from '@xterm/xterm';
22-
import { Event } from 'vs/base/common/event';
23-
import { LabelService } from 'vs/workbench/services/label/common/labelService';
24-
import { ILabelService } from 'vs/platform/label/common/label';
25-
import { OpenerService } from 'vs/editor/browser/services/openerService';
26-
import { IOpenerService } from 'vs/platform/opener/common/opener';
27-
import { IStorageService } from 'vs/platform/storage/common/storage';
28-
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
29-
import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
3027
import { ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
31-
import { importAMDNodeModule } from 'vs/amdX';
32-
import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
33-
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
28+
import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
29+
import { getQuickFixesForCommand, TerminalQuickFixAddon } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon';
30+
import { freePort, FreePortOutputRegex, gitCreatePr, GitCreatePrOutputRegex, gitPull, GitPullOutputRegex, GitPushOutputRegex, gitPushSetUpstream, gitSimilar, GitSimilarOutputRegex, gitTwoDashes, GitTwoDashesRegex, pwshGeneralError, PwshGeneralErrorOutputRegex, pwshUnixCommandNotFoundError, PwshUnixCommandNotFoundErrorOutputRegex } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions';
31+
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
3432

3533
suite('QuickFixAddon', () => {
3634
const store = ensureNoDisposablesAreLeakedInTestSuite();
3735

3836
let quickFixAddon: TerminalQuickFixAddon;
3937
let commandDetection: CommandDetectionCapability;
4038
let commandService: TestCommandService;
41-
let openerService: OpenerService;
42-
let labelService: LabelService;
39+
let openerService: IOpenerService;
40+
let labelService: ILabelService;
4341
let terminal: Terminal;
4442
let instantiationService: TestInstantiationService;
4543

@@ -59,13 +57,13 @@ suite('QuickFixAddon', () => {
5957
extensionQuickFixes: Promise.resolve([])
6058
} as Partial<ITerminalQuickFixService>);
6159
instantiationService.stub(IConfigurationService, new TestConfigurationService());
62-
instantiationService.stub(ILabelService, {} as Partial<ILabelService>);
60+
labelService = instantiationService.stub(ILabelService, {} as Partial<ILabelService>);
6361
const capabilities = store.add(new TerminalCapabilityStore());
6462
instantiationService.stub(ILogService, new NullLogService());
6563
commandDetection = store.add(instantiationService.createInstance(CommandDetectionCapability, terminal));
6664
capabilities.add(TerminalCapability.CommandDetection, commandDetection);
6765
instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService)));
68-
instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>);
66+
openerService = instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>);
6967
commandService = new TestCommandService(instantiationService);
7068

7169
quickFixAddon = instantiationService.createInstance(TerminalQuickFixAddon, [], capabilities);

‎yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10333,10 +10333,10 @@ typescript@^4.7.4:
1033310333
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
1033410334
integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
1033510335

10336-
typescript@^5.6.0-dev.20240816:
10337-
version "5.6.0-dev.20240816"
10338-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.0-dev.20240816.tgz#8379bca47a0cc4d015f729e1bea55935fd86d285"
10339-
integrity sha512-q6FNh1r9BcrpYEeblr50Kh7l1G+TZkYHt73Cr0VljCILUYBEyJ4kd6C5MB/cLr6EN9vJaud1CKijp2yl8ZlRuw==
10336+
typescript@^5.7.0-dev.20240826:
10337+
version "5.7.0-dev.20240826"
10338+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.0-dev.20240826.tgz#81141692ffa634350236c866a5646faf5d565063"
10339+
integrity sha512-TsvYVfLcEGOXj9aWrf72qFTnZ8B+IoDuRQwPDHZMO6Y9QzIjM0iOhydUEKS9HPxpypAcyt1RC6xT9GybzOiLZQ==
1034010340

1034110341
typical@^4.0.0:
1034210342
version "4.0.0"

0 commit comments

Comments
 (0)