Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 12:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pick up latest TS for building VS Code

Browse Source
This commit is contained in:
Matt Bierner
2024-08-26 11:21:20 -07:00
parent 94f8698428
commit efb6885676
4 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -215,7 +215,7 @@
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"tsec": "0.2.7", "tsec": "0.2.7",
"tslib": "^2.6.3", "tslib": "^2.6.3",
"typescript": "^5.6.0-dev.20240816", "typescript": "^5.7.0-dev.20240826",
"util": "^0.12.4", "util": "^0.12.4",
"vscode-nls-dev": "^3.3.1", "vscode-nls-dev": "^3.3.1",
"webpack": "^5.91.0", "webpack": "^5.91.0",

4
src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
View File

@@ -9,17 +9,17 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/uti
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService'; import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
import { ContextKeyEqualsExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ContextKeyEqualsExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';
import { IToolData, IToolImpl, IToolInvocation, LanguageModelToolsService } from '../../common/languageModelToolsService'; import { IToolData, IToolImpl, IToolInvocation, LanguageModelToolsService } from '../../common/languageModelToolsService';
suite('LanguageModelToolsService', () => { suite('LanguageModelToolsService', () => {
const store = ensureNoDisposablesAreLeakedInTestSuite(); const store = ensureNoDisposablesAreLeakedInTestSuite();
let extensionService: IExtensionService;
let contextKeyService: IContextKeyService; let contextKeyService: IContextKeyService;
let service: LanguageModelToolsService; let service: LanguageModelToolsService;
setup(() => { setup(() => {
const extensionService = new TestExtensionService();
contextKeyService = store.add(new ContextKeyService(new TestConfigurationService())); contextKeyService = store.add(new ContextKeyService(new TestConfigurationService()));
service = store.add(new LanguageModelToolsService(extensionService, contextKeyService)); service = store.add(new LanguageModelToolsService(extensionService, contextKeyService));
}); });

36
src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts
View File

@@ -3,34 +3,32 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import type { Terminal } from '@xterm/xterm';
import { strictEqual } from 'assert'; import { strictEqual } from 'assert';
import { importAMDNodeModule } from 'vs/amdX';
import { IAction } from 'vs/base/common/actions'; import { IAction } from 'vs/base/common/actions';
import { Event } from 'vs/base/common/event';
import { isWindows } from 'vs/base/common/platform'; import { isWindows } from 'vs/base/common/platform';
import { URI } from 'vs/base/common/uri';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
import { TestCommandService } from 'vs/editor/test/browser/editorTestServices';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService'; import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { ILabelService } from 'vs/platform/label/common/label';
import { ILogService, NullLogService } from 'vs/platform/log/common/log'; import { ILogService, NullLogService } from 'vs/platform/log/common/log';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { IStorageService } from 'vs/platform/storage/common/storage';
import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability'; import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability';
import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore'; import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore';
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';
import { TerminalQuickFixAddon, getQuickFixesForCommand } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon';
import { URI } from 'vs/base/common/uri';
import type { Terminal } from '@xterm/xterm';
import { Event } from 'vs/base/common/event';
import { LabelService } from 'vs/workbench/services/label/common/labelService';
import { ILabelService } from 'vs/platform/label/common/label';
import { OpenerService } from 'vs/editor/browser/services/openerService';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { IStorageService } from 'vs/platform/storage/common/storage';
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
import { ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal'; import { ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal';
import { importAMDNodeModule } from 'vs/amdX'; import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix';
import { TestCommandService } from 'vs/editor/test/browser/editorTestServices'; import { getQuickFixesForCommand, TerminalQuickFixAddon } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon';
import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; 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';
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
suite('QuickFixAddon', () => { suite('QuickFixAddon', () => {
const store = ensureNoDisposablesAreLeakedInTestSuite(); const store = ensureNoDisposablesAreLeakedInTestSuite();
@@ -38,8 +36,8 @@ suite('QuickFixAddon', () => {
let quickFixAddon: TerminalQuickFixAddon; let quickFixAddon: TerminalQuickFixAddon;
let commandDetection: CommandDetectionCapability; let commandDetection: CommandDetectionCapability;
let commandService: TestCommandService; let commandService: TestCommandService;
let openerService: OpenerService; let openerService: IOpenerService;
let labelService: LabelService; let labelService: ILabelService;
let terminal: Terminal; let terminal: Terminal;
let instantiationService: TestInstantiationService; let instantiationService: TestInstantiationService;
@@ -59,13 +57,13 @@ suite('QuickFixAddon', () => {
extensionQuickFixes: Promise.resolve([]) extensionQuickFixes: Promise.resolve([])
} as Partial<ITerminalQuickFixService>); } as Partial<ITerminalQuickFixService>);
instantiationService.stub(IConfigurationService, new TestConfigurationService()); instantiationService.stub(IConfigurationService, new TestConfigurationService());
instantiationService.stub(ILabelService, {} as Partial<ILabelService>); labelService = instantiationService.stub(ILabelService, {} as Partial<ILabelService>);
const capabilities = store.add(new TerminalCapabilityStore()); const capabilities = store.add(new TerminalCapabilityStore());
instantiationService.stub(ILogService, new NullLogService()); instantiationService.stub(ILogService, new NullLogService());
commandDetection = store.add(instantiationService.createInstance(CommandDetectionCapability, terminal)); commandDetection = store.add(instantiationService.createInstance(CommandDetectionCapability, terminal));
capabilities.add(TerminalCapability.CommandDetection, commandDetection); capabilities.add(TerminalCapability.CommandDetection, commandDetection);
instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService))); instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService)));
instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>); openerService = instantiationService.stub(IOpenerService, {} as Partial<IOpenerService>);
commandService = new TestCommandService(instantiationService); commandService = new TestCommandService(instantiationService);
quickFixAddon = instantiationService.createInstance(TerminalQuickFixAddon, [], capabilities); quickFixAddon = instantiationService.createInstance(TerminalQuickFixAddon, [], capabilities);

8
yarn.lock
View File

@@ -10333,10 +10333,10 @@ typescript@^4.7.4:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
typescript@^5.6.0-dev.20240816: typescript@^5.7.0-dev.20240826:
version "5.6.0-dev.20240816" version "5.7.0-dev.20240826"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.0-dev.20240816.tgz#8379bca47a0cc4d015f729e1bea55935fd86d285" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.0-dev.20240826.tgz#81141692ffa634350236c866a5646faf5d565063"
integrity sha512-q6FNh1r9BcrpYEeblr50Kh7l1G+TZkYHt73Cr0VljCILUYBEyJ4kd6C5MB/cLr6EN9vJaud1CKijp2yl8ZlRuw== integrity sha512-TsvYVfLcEGOXj9aWrf72qFTnZ8B+IoDuRQwPDHZMO6Y9QzIjM0iOhydUEKS9HPxpypAcyt1RC6xT9GybzOiLZQ==
typical@^4.0.0: typical@^4.0.0:
version "4.0.0" version "4.0.0"