Skip to content

Commit b95d246

Browse files
committed
Pick up TS 5.5 for builtin ts extension
For microsoft#214169
1 parent 438ea79 commit b95d246

File tree

4 files changed

+5
-71
lines changed

4 files changed

+5
-71
lines changed

extensions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"description": "Dependencies shared by all extensions",
66
"dependencies": {
7-
"typescript": "5.4.5"
7+
"typescript": "^5.5.0-dev.20240603"
88
},
99
"scripts": {
1010
"postinstall": "node ./postinstall.mjs"

extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts

-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ export default class FileConfigurationManager extends Disposable {
191191
includeCompletionsWithClassMemberSnippets: config.get<boolean>('suggest.classMemberSnippets.enabled', true),
192192
includeCompletionsWithObjectLiteralMethodSnippets: config.get<boolean>('suggest.objectLiteralMethodSnippets.enabled', true),
193193
autoImportFileExcludePatterns: this.getAutoImportFileExcludePatternsPreference(preferencesConfig, vscode.workspace.getWorkspaceFolder(document.uri)?.uri),
194-
// @ts-expect-error until 5.3 #56090
195194
preferTypeOnlyAutoImports: preferencesConfig.get<boolean>('preferTypeOnlyAutoImports', false),
196195
useLabelDetailsInCompletionEntries: true,
197196
allowIncompleteCompletions: true,

extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts

-65
Original file line numberDiff line numberDiff line change
@@ -19,70 +19,5 @@ declare module '../../../../node_modules/typescript/lib/typescript' {
1919
interface Response {
2020
readonly _serverType?: ServerType;
2121
}
22-
23-
//#region MapCode
24-
export interface MapCodeRequestArgs extends FileRequestArgs {
25-
/**
26-
* The files and changes to try and apply/map.
27-
*/
28-
mapping: MapCodeRequestDocumentMapping;
29-
}
30-
31-
export interface MapCodeRequestDocumentMapping {
32-
/**
33-
* The specific code to map/insert/replace in the file.
34-
*/
35-
contents: string[];
36-
37-
/**
38-
* Areas of "focus" to inform the code mapper with. For example, cursor
39-
* location, current selection, viewport, etc. Nested arrays denote
40-
* priority: toplevel arrays are more important than inner arrays, and
41-
* inner array priorities are based on items within that array. Items
42-
* earlier in the arrays have higher priority.
43-
*/
44-
focusLocations?: TextSpan[][];
45-
}
46-
47-
export interface MapCodeRequest extends FileRequest {
48-
command: 'mapCode';
49-
arguments: MapCodeRequestArgs;
50-
}
51-
52-
export interface MapCodeResponse extends Response {
53-
body: FileCodeEdits[]
54-
}
55-
//#endregion
56-
57-
//#region Paste
58-
export interface GetPasteEditsRequest extends Request {
59-
command: 'getPasteEdits';
60-
arguments: GetPasteEditsRequestArgs;
61-
}
62-
63-
export interface GetPasteEditsRequestArgs extends FileRequestArgs {
64-
/** The text that gets pasted in a file. */
65-
pastedText: string[];
66-
/** Locations of where the `pastedText` gets added in a file. If the length of the `pastedText` and `pastedLocations` are not the same,
67-
* then the `pastedText` is combined into one and added at all the `pastedLocations`.
68-
*/
69-
pasteLocations: TextSpan[];
70-
/** The source location of each `pastedText`. If present, the length of `spans` must be equal to the length of `pastedText`. */
71-
copiedFrom?: {
72-
file: string;
73-
spans: TextSpan[];
74-
};
75-
}
76-
77-
export interface GetPasteEditsResponse extends Response {
78-
body: PasteEditsAction;
79-
}
80-
export interface PasteEditsAction {
81-
edits: FileCodeEdits[];
82-
fixId?: {};
83-
}
84-
//#endregion
8522
}
8623
}
87-
88-

extensions/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ to-regex-range@^5.0.1:
234234
dependencies:
235235
is-number "^7.0.0"
236236

237-
typescript@5.4.5:
238-
version "5.4.5"
239-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
240-
integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
237+
typescript@^5.5.0-dev.20240603:
238+
version "5.5.0-dev.20240603"
239+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.0-dev.20240603.tgz#a1b7311df5039a8abbaaa2213c21cac6ec547490"
240+
integrity sha512-gdm3Sh1A+Pjj9ZlfBEJY3o2rs3tvpcSbu3vYqcCijMe09BePQBtZlsuShuPn+zCnP+qBLxdKjFiw5v1tkna3tA==
241241

242242
vscode-grammar-updater@^1.1.0:
243243
version "1.1.0"

0 commit comments

Comments
 (0)