fix(deps): update packages/service/vscode digest to 65d85f4 (#204)

* fix(deps): update packages/service/vscode digest to 65d85f4 * update patches --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: yioneko <yioneko@outlook.com>
yioneko · Sep 21, 2024 · 88b9d36 · 88b9d36
1 parent 51b2b6d
commit 88b9d36
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 83 deletions.
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
@@ -164,7 +164,7 @@ function bindServiceHandlers(
   conn.onPrepareRename(safeRun(service.prepareRename, null));
   conn.onRenameRequest(safeRun(service.rename, null));
   conn.onFoldingRanges(safeRun(service.foldingRanges, null));
-  conn.onSelectionRanges(safeRun(service.selectionRanges, null, true));
+  conn.onSelectionRanges(safeRun(service.selectionRanges, null));
   conn.onCodeLens(safeRun(service.codeLens, null));
   conn.onCodeLensResolve(service.codeLensResolve);
   conn.languages.callHierarchy.onPrepare(safeRun(service.prepareCallHierarchy, null, true));

diff --git a/packages/service/patches/003-read-global-plugins.patch b/packages/service/patches/003-read-global-plugins.patch
@@ -79,10 +79,10 @@ index 6036e4c..1d3efd6 100644
  	}
  }
 diff --git a/src/tsServer/spawner.ts b/src/tsServer/spawner.ts
-index 364c0f0..0088fff 100644
+index aac3186..3b362e8 100644
 --- a/src/tsServer/spawner.ts
 +++ b/src/tsServer/spawner.ts
-@@ -253,7 +253,7 @@ export class TypeScriptServerSpawner {
+@@ -250,7 +250,7 @@ export class TypeScriptServerSpawner {
 
  			const isUsingBundledTypeScriptVersion = currentVersion.path === this._versionProvider.defaultVersion.path;
  			for (const plugin of pluginManager.plugins) {

diff --git a/packages/service/patches/010-editor-format-options.patch b/packages/service/patches/010-editor-format-options.patch
@@ -1,5 +1,5 @@
 diff --git a/src/languageFeatures/fileConfigurationManager.ts b/src/languageFeatures/fileConfigurationManager.ts
-index bddd062..1556037 100644
+index 0b5a4c6..6b0b762 100644
 --- a/src/languageFeatures/fileConfigurationManager.ts
 +++ b/src/languageFeatures/fileConfigurationManager.ts
 @@ -46,26 +46,27 @@ export default class FileConfigurationManager extends Disposable {

diff --git a/packages/service/patches/015-disable-bufsync-tab-resource.patch b/packages/service/patches/015-disable-bufsync-tab-resource.patch
@@ -1,8 +1,8 @@
 diff --git a/src/tsServer/bufferSyncSupport.ts b/src/tsServer/bufferSyncSupport.ts
-index 32707f1..f1105b7 100644
+index 356c170..20db569 100644
 --- a/src/tsServer/bufferSyncSupport.ts
 +++ b/src/tsServer/bufferSyncSupport.ts
-@@ -782,10 +782,6 @@ export default class BufferSyncSupport extends Disposable {
+@@ -756,10 +756,6 @@ export default class BufferSyncSupport extends Disposable {
  			return false;
  		}
 

diff --git a/packages/service/patches/040-revert-42fbc2f-for-link-rendering.patch b/packages/service/patches/040-revert-42fbc2f-for-link-rendering.patch
@@ -1,8 +1,8 @@
 diff --git a/src/languageFeatures/util/textRendering.ts b/src/languageFeatures/util/textRendering.ts
-index fe26dd6..e258a88 100644
+index af1a7e6..f5540a7 100644
 --- a/src/languageFeatures/util/textRendering.ts
 +++ b/src/languageFeatures/util/textRendering.ts
-@@ -173,15 +173,12 @@ function convertLinkTags(
+@@ -155,15 +155,12 @@ function convertLinkTags(
  			case 'link':
  				if (currentLink) {
  					if (currentLink.target) {

diff --git a/packages/service/patches/060-disable-web-server-cancellation.patch b/packages/service/patches/060-disable-web-server-cancellation.patch
@@ -1,5 +1,5 @@
 diff --git a/src/tsServer/server.ts b/src/tsServer/server.ts
-index 883aa68..1e40a86 100644
+index 4e41f7a..2d2c13a 100644
 --- a/src/tsServer/server.ts
 +++ b/src/tsServer/server.ts
 @@ -3,7 +3,6 @@
@@ -10,7 +10,7 @@ index 883aa68..1e40a86 100644
  import * as vscode from 'vscode';
  import { TypeScriptServiceConfiguration } from '../configuration/configuration';
  import { TelemetryReporter } from '../logging/telemetry';
-@@ -230,12 +229,12 @@ export class SingleTsServer extends Disposable implements ITypeScriptServer {
+@@ -233,12 +232,12 @@ export class SingleTsServer extends Disposable implements ITypeScriptServer {
 
  				if (executeInfo.token) {
 

diff --git a/packages/service/patches/105-fix-double-progress.patch b/packages/service/patches/105-fix-double-progress.patch
diff --git a/packages/service/patches/110-fix-file-references-command-name.patch b/packages/service/patches/110-fix-file-references-command-name.patch
@@ -1,8 +1,8 @@
 diff --git a/package.json b/package.json
-index 3f7fdcf..d312fa1 100644
+index 92a36e5..5278491 100644
 --- a/package.json
 +++ b/package.json
-@@ -68,7 +68,7 @@
+@@ -67,7 +67,7 @@
      "onCommand:typescript.tsserverRequest",
      "onCommand:_typescript.configurePlugin",
      "onCommand:_typescript.learnMoreAboutRefactorings",

diff --git 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 25dfca2..bdc0ab1 100644
+index a1f06a3..41d3419 100644
 --- a/src/typescriptServiceClient.ts
 +++ b/src/typescriptServiceClient.ts
-@@ -857,7 +857,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -881,7 +881,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
  					expectsResult: true,
  					...config,
  				});

diff --git a/packages/service/patches/180-auto-use-workspace-tsdk.patch b/packages/service/patches/180-auto-use-workspace-tsdk.patch
@@ -1,5 +1,5 @@
 diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts
-index 639f3d3..196c6eb 100644
+index d70b8f7..7cf087f 100644
 --- a/src/configuration/configuration.ts
 +++ b/src/configuration/configuration.ts
 @@ -101,6 +101,7 @@ export class ImplicitProjectConfiguration {

diff --git a/packages/service/patches/230-expose-additional-text-edits.patch b/packages/service/patches/230-expose-additional-text-edits.patch
@@ -1,8 +1,8 @@
 diff --git a/src/languageFeatures/completions.ts b/src/languageFeatures/completions.ts
-index 708d7e0..98401e7 100644
+index 749e74b..fd3d08b 100644
 --- a/src/languageFeatures/completions.ts
 +++ b/src/languageFeatures/completions.ts
-@@ -201,7 +201,7 @@ class MyCompletionItem extends vscode.CompletionItem {
+@@ -202,7 +202,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 
  			this.documentation = this.getDocumentation(client, detail, this.document.uri);
 
@@ -11,7 +11,7 @@ index 708d7e0..98401e7 100644
  			const commands: vscode.Command[] = [{
  				command: CompletionAcceptedCommand.ID,
  				title: '',
-@@ -314,7 +314,8 @@ class MyCompletionItem extends vscode.CompletionItem {
+@@ -315,7 +315,8 @@ class MyCompletionItem extends vscode.CompletionItem {
 
  	private getCodeActions(
  		detail: Proto.CompletionEntryDetails,
@@ -21,7 +21,7 @@ index 708d7e0..98401e7 100644
  	): { command?: vscode.Command; additionalTextEdits?: vscode.TextEdit[] } {
  		if (!detail.codeActions?.length) {
  			return {};
-@@ -333,7 +334,8 @@ class MyCompletionItem extends vscode.CompletionItem {
+@@ -334,7 +335,8 @@ class MyCompletionItem extends vscode.CompletionItem {
  			// Apply all edits in the current file using `additionalTextEdits`
  			if (tsAction.changes) {
  				for (const change of tsAction.changes) {
@@ -31,7 +31,7 @@ index 708d7e0..98401e7 100644
  						additionalTextEdits.push(...change.textChanges.map(typeConverters.TextEdit.fromCodeEdit));
  					} else {
  						hasRemainingCommandsOrEdits = true;
-@@ -586,7 +588,7 @@ class ApplyCompletionCommand implements Command {
+@@ -602,7 +604,7 @@ class ApplyCompletionCommand implements Command {
 
  		const { edits, commands } = resolved;
 
@@ -40,7 +40,7 @@ index 708d7e0..98401e7 100644
  			const workspaceEdit = new vscode.WorkspaceEdit();
  			for (const edit of edits) {
  				workspaceEdit.replace(item.document.uri, edit.range, edit.newText);
-@@ -883,7 +885,8 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
+@@ -893,7 +895,8 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
  		item: MyCompletionItem,
  		token: vscode.CancellationToken
  	): Promise<MyCompletionItem | undefined> {

diff --git a/packages/service/patches/300-update-paths-on-rename.patch b/packages/service/patches/300-update-paths-on-rename.patch
@@ -1,8 +1,8 @@
 diff --git a/src/languageFeatures/updatePathsOnRename.ts b/src/languageFeatures/updatePathsOnRename.ts
-index 91ca961..011854c 100644
+index bdaa1fc..3c3e9a8 100644
 --- a/src/languageFeatures/updatePathsOnRename.ts
 +++ b/src/languageFeatures/updatePathsOnRename.ts
-@@ -100,13 +100,13 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
+@@ -98,13 +98,13 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
  			const resourcesBeingRenamed: vscode.Uri[] = [];
 
  			for (const { oldUri, newUri, newFilePath, oldFilePath, jsTsFileThatIsBeingMoved } of group) {
@@ -19,7 +19,7 @@ index 91ca961..011854c 100644
  					resourcesBeingRenamed.push(newUri);
  				}
  			}
-@@ -206,8 +206,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
+@@ -204,8 +204,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
  		}
 
  		if (await isDirectory(resource)) {
@@ -29,7 +29,7 @@ index 91ca961..011854c 100644
  		}
 
  		return (await this._handles(resource)) ? resource : undefined;
-@@ -215,12 +214,12 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
+@@ -213,12 +212,12 @@ class UpdateImportsOnFileRenameHandler extends Disposable {
 
  	private async withEditsForFileRename(
  		edits: vscode.WorkspaceEdit,

diff --git a/packages/service/patches/400-register-full-semantic-tokens-provider.patch b/packages/service/patches/400-register-full-semantic-tokens-provider.patch
@@ -1,8 +1,8 @@
 diff --git a/src/languageFeatures/semanticTokens.ts b/src/languageFeatures/semanticTokens.ts
-index 48c9af7..cfba213 100644
+index 7f8d60d..0d9014a 100644
 --- a/src/languageFeatures/semanticTokens.ts
 +++ b/src/languageFeatures/semanticTokens.ts
-@@ -22,7 +22,10 @@ export function register(
+@@ -20,7 +20,10 @@ export function register(
  		requireSomeCapability(client, ClientCapability.Semantic),
  	], () => {
  		const provider = new DocumentSemanticTokensProvider(client);

diff --git a/packages/service/patches/410-handle-yarn-zipfile.patch b/packages/service/patches/410-handle-yarn-zipfile.patch
@@ -19,10 +19,10 @@ index ca268e2..96c9f0b 100644
  }
 
 diff --git a/src/typescriptServiceClient.ts b/src/typescriptServiceClient.ts
-index 25dfca2..6330dd8 100644
+index 41d3419..6378806 100644
 --- a/src/typescriptServiceClient.ts
 +++ b/src/typescriptServiceClient.ts
-@@ -572,7 +572,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -596,7 +596,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
  			: undefined;
 
  		const configureOptions: Proto.ConfigureRequestArguments = {
@@ -31,7 +31,7 @@ index 25dfca2..6330dd8 100644
  			preferences: {
  				providePrefixAndSuffixTextForRename: true,
  				allowRenameOfImportPath: true,
-@@ -748,6 +748,10 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -772,6 +772,10 @@ export default class TypeScriptServiceClient extends Disposable implements IType
  			return resource.fsPath;
  		}
 
@@ -42,7 +42,7 @@ index 25dfca2..6330dd8 100644
  		return (this.isProjectWideIntellisenseOnWebEnabled() ? '' : inMemoryResourcePrefix)
  			+ '/' + resource.scheme
  			+ '/' + (resource.authority || emptyAuthority)
-@@ -796,6 +800,17 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -820,6 +824,17 @@ export default class TypeScriptServiceClient extends Disposable implements IType
  				return this.bufferSyncSupport.toVsCodeResource(resource);
  			}
  		}

diff --git a/packages/service/vscode b/packages/service/vscode