diff --git a/packages/service/patches/020-trigger-features-registered-event.patch b/packages/service/patches/020-trigger-features-registered-event.patch index 7ca3b67..9b94077 100644 --- a/packages/service/patches/020-trigger-features-registered-event.patch +++ b/packages/service/patches/020-trigger-features-registered-event.patch @@ -1,10 +1,10 @@ diff --git a/src/languageProvider.ts b/src/languageProvider.ts -index 09a4fe3..3c9d29b 100644 +index feb47f0..639a58d 100644 --- a/src/languageProvider.ts +++ b/src/languageProvider.ts -@@ -93,6 +93,7 @@ export default class LanguageProvider extends Disposable { +@@ -92,6 +92,7 @@ export default class LanguageProvider extends Disposable { + import('./languageFeatures/tagClosing').then(provider => this._register(provider.register(selector, this.description, this.client))), import('./languageFeatures/typeDefinitions').then(provider => this._register(provider.register(selector, this.client))), - import('./languageFeatures/copilotRelated').then(provider => this._register(provider.register(selector, this.client))), ]); + (vscode.languages as any).$triggerStaticFeaturesRegistered(); } diff --git a/packages/service/patches/040-revert-42fbc2f-for-link-rendering.patch b/packages/service/patches/040-revert-42fbc2f-for-link-rendering.patch index 28ae2bd..2a30805 100644 --- a/packages/service/patches/040-revert-42fbc2f-for-link-rendering.patch +++ b/packages/service/patches/040-revert-42fbc2f-for-link-rendering.patch @@ -1,5 +1,5 @@ diff --git a/src/languageFeatures/util/textRendering.ts b/src/languageFeatures/util/textRendering.ts -index af1a7e6..f5540a7 100644 +index f44ac0c..1929087 100644 --- a/src/languageFeatures/util/textRendering.ts +++ b/src/languageFeatures/util/textRendering.ts @@ -155,15 +155,12 @@ function convertLinkTags( diff --git a/packages/service/patches/110-fix-file-references-command-name.patch b/packages/service/patches/110-fix-file-references-command-name.patch index f9c0f1c..2ef9c08 100644 --- a/packages/service/patches/110-fix-file-references-command-name.patch +++ b/packages/service/patches/110-fix-file-references-command-name.patch @@ -1,5 +1,5 @@ diff --git a/package.json b/package.json -index c6363df..634a567 100644 +index 51ac7bd..79dc111 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ diff --git a/packages/service/patches/120-fix-tsserver-error-uncaught.patch b/packages/service/patches/120-fix-tsserver-error-uncaught.patch index 14fbe06..67e2211 100644 --- a/packages/service/patches/120-fix-tsserver-error-uncaught.patch +++ b/packages/service/patches/120-fix-tsserver-error-uncaught.patch @@ -1,8 +1,8 @@ diff --git a/src/typescriptServiceClient.ts b/src/typescriptServiceClient.ts -index b5fdb18..d196d68 100644 +index d9f47c1..f45f4bf 100644 --- a/src/typescriptServiceClient.ts +++ b/src/typescriptServiceClient.ts -@@ -877,7 +877,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -868,7 +868,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType expectsResult: true, ...config, }); diff --git a/packages/service/patches/280-move-to-file-refactor-action.patch b/packages/service/patches/280-move-to-file-refactor-action.patch index 6138127..9f46323 100644 --- a/packages/service/patches/280-move-to-file-refactor-action.patch +++ b/packages/service/patches/280-move-to-file-refactor-action.patch @@ -1,8 +1,8 @@ diff --git a/src/commands/tsserverRequests.ts b/src/commands/tsserverRequests.ts -index 50aeedf..96ab233 100644 +index 0fc70b3..e4c0a5d 100644 --- a/src/commands/tsserverRequests.ts +++ b/src/commands/tsserverRequests.ts -@@ -33,7 +33,8 @@ export class TSServerRequestCommand implements Command { +@@ -53,7 +53,8 @@ export class TSServerRequestCommand implements Command { // Introspecting code at a position 'quickinfo', 'quickinfo-full', diff --git a/packages/service/patches/410-handle-yarn-zipfile.patch b/packages/service/patches/410-handle-yarn-zipfile.patch index 03ef3eb..e875f9b 100644 --- a/packages/service/patches/410-handle-yarn-zipfile.patch +++ b/packages/service/patches/410-handle-yarn-zipfile.patch @@ -19,10 +19,10 @@ index 9d54f0b..c77603c 100644 if (isWeb()) { diff --git a/src/typescriptServiceClient.ts b/src/typescriptServiceClient.ts -index d196d68..40a1269 100644 +index f45f4bf..c4cd5cd 100644 --- a/src/typescriptServiceClient.ts +++ b/src/typescriptServiceClient.ts -@@ -596,7 +596,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -586,7 +586,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType : undefined; const configureOptions: Proto.ConfigureRequestArguments = { @@ -31,7 +31,7 @@ index d196d68..40a1269 100644 preferences: { providePrefixAndSuffixTextForRename: true, allowRenameOfImportPath: true, -@@ -768,6 +768,10 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -758,6 +758,10 @@ export default class TypeScriptServiceClient extends Disposable implements IType return resource.fsPath; } @@ -42,7 +42,7 @@ index d196d68..40a1269 100644 return (this.isProjectWideIntellisenseOnWebEnabled() ? '' : inMemoryResourcePrefix) + '/' + resource.scheme + '/' + (resource.authority || emptyAuthority) -@@ -816,6 +820,17 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -807,6 +811,17 @@ export default class TypeScriptServiceClient extends Disposable implements IType return this.bufferSyncSupport.toVsCodeResource(resource); } } diff --git a/packages/service/patches/450-fix-tsc-err.patch b/packages/service/patches/450-fix-tsc-err.patch index e75fc6a..67d0448 100644 --- a/packages/service/patches/450-fix-tsc-err.patch +++ b/packages/service/patches/450-fix-tsc-err.patch @@ -11,32 +11,3 @@ index 8fd7ce4..b1d24bc 100644 import VsCodeTelemetryReporter from '@vscode/extension-telemetry'; import * as vscode from 'vscode'; import * as tas from 'vscode-tas-client'; -diff --git a/src/languageFeatures/copilotRelated.ts b/src/languageFeatures/copilotRelated.ts -index 632b047..009d112 100644 ---- a/src/languageFeatures/copilotRelated.ts -+++ b/src/languageFeatures/copilotRelated.ts -@@ -70,10 +70,12 @@ export function register( - if (!file) { - return { entries: [] }; - } -+ // @ts-expect-error until ts 5.7 - const response = await client.execute('copilotRelated', { file, }, token) as Proto.CopilotRelatedResponse; - if (response.type !== 'response' || !response.body) { - return { entries: [] }; - } -+ // @ts-expect-error until ts 5.7 - return { entries: response.body.relatedFiles.map(f => client.toResource(f)), traits: [] }; - })); - } -diff --git a/src/typescriptService.ts b/src/typescriptService.ts -index 306769f..3a72428 100644 ---- a/src/typescriptService.ts -+++ b/src/typescriptService.ts -@@ -77,6 +77,7 @@ interface StandardTsServerRequests { - 'getMoveToRefactoringFileSuggestions': [Proto.GetMoveToRefactoringFileSuggestionsRequestArgs, Proto.GetMoveToRefactoringFileSuggestions]; - 'linkedEditingRange': [Proto.FileLocationRequestArgs, Proto.LinkedEditingRangeResponse]; - 'mapCode': [Proto.MapCodeRequestArgs, Proto.MapCodeResponse]; -+ // @ts-expect-error until ts 5.7 - 'copilotRelated': [Proto.FileRequestArgs, Proto.CopilotRelatedResponse]; - 'getPasteEdits': [Proto.GetPasteEditsRequestArgs, Proto.GetPasteEditsResponse]; - 'preparePasteEdits': [Proto.PreparePasteEditsRequestArgs, Proto.PreparePasteEditsResponse]; diff --git a/packages/service/src/shims/types.ts b/packages/service/src/shims/types.ts index f1a367d..874e285 100644 --- a/packages/service/src/shims/types.ts +++ b/packages/service/src/shims/types.ts @@ -1918,6 +1918,7 @@ export enum DocumentPasteTriggerKind { export class DocumentDropOrPasteEditKind { static Empty: DocumentDropOrPasteEditKind; + static Text: DocumentDropOrPasteEditKind; private static sep = '.'; @@ -1938,6 +1939,7 @@ export class DocumentDropOrPasteEditKind { } } DocumentDropOrPasteEditKind.Empty = new DocumentDropOrPasteEditKind(''); +DocumentDropOrPasteEditKind.Text = new DocumentDropOrPasteEditKind('text'); export class DocumentPasteEdit { diff --git a/packages/service/vscode b/packages/service/vscode index 05f13ec..a3261ea 160000 --- a/packages/service/vscode +++ b/packages/service/vscode @@ -1 +1 @@ -Subproject commit 05f13ecf8a88f6d9b51b519ea602c3f6b20bb255 +Subproject commit a3261eae42b18ff8cb685cf649c27c8b27985eec