From 8dd5b1c3336e2a7d0b25ac642bb204fd1f687522 Mon Sep 17 00:00:00 2001 From: johnsoncodehk Date: Sun, 26 Dec 2021 22:20:12 +0800 Subject: [PATCH] refactor: remove extra props hover info logic due to upstream resolved https://github.com/vuejs/vue-next/pull/5166 --- .../src/services/hover.ts | 18 +----------------- .../vue-code-gen/src/generators/template.ts | 2 +- packages/vue-code-gen/src/types.ts | 1 - 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/packages/vscode-vue-languageservice/src/services/hover.ts b/packages/vscode-vue-languageservice/src/services/hover.ts index 0d0b12071..d6608f515 100644 --- a/packages/vscode-vue-languageservice/src/services/hover.ts +++ b/packages/vscode-vue-languageservice/src/services/hover.ts @@ -29,7 +29,7 @@ export function register({ sourceFiles, htmlLs, pugLs, getCssLs, getTsLs, vueHos return result; } - function onTs(uri: string, position: vscode.Position, isExtra = false) { + function onTs(uri: string, position: vscode.Position) { let result: vscode.Hover | undefined; @@ -48,25 +48,9 @@ export function register({ sourceFiles, htmlLs, pugLs, getCssLs, getTsLs, vueHos const tsHover = tsLs.doHover( tsLoc.uri, tsLoc.range.start, - isExtra, ); if (!tsHover) continue; - if (!isExtra && tsLoc.type === 'embedded-ts' && tsLoc.data.capabilities.extraHoverInfo) { - const definitions = findDefinitions.on(uri, position) as vscode.LocationLink[]; - for (const definition of definitions) { - const extraHover = onTs(definition.targetUri, definition.targetSelectionRange.start, true); - if (!extraHover) continue; - if (!vscode.MarkupContent.is(extraHover.contents)) continue; - const extraText = extraHover.contents.value; - for (const extraTextPart of extraText.split('\n\n')) { - if (vscode.MarkupContent.is(tsHover.contents) && !tsHover.contents.value.split('\n\n').includes(extraTextPart)) { - tsHover.contents.value += `\n\n` + extraTextPart; - } - } - } - } - if (tsHover.range) { // ts -> vue const hoverRange = { start: position, end: position }; diff --git a/packages/vue-code-gen/src/generators/template.ts b/packages/vue-code-gen/src/generators/template.ts index de0ed6fd8..2300d4f20 100644 --- a/packages/vue-code-gen/src/generators/template.ts +++ b/packages/vue-code-gen/src/generators/template.ts @@ -13,7 +13,7 @@ const capabilitiesSet = { tagHover: { basic: true }, event: { basic: true, diagnostic: true }, tagReference: { references: true, definitions: true, rename: true, }, - attr: { basic: true, extraHoverInfo: true, diagnostic: true, references: true, definitions: true, rename: true, }, + attr: { basic: true, diagnostic: true, references: true, definitions: true, rename: true, }, attrReference: { references: true, definitions: true, rename: true, }, scopedClassName: { references: true, definitions: true, rename: true, }, slotName: { basic: true, diagnostic: true, references: true, definitions: true, completion: true, }, diff --git a/packages/vue-code-gen/src/types.ts b/packages/vue-code-gen/src/types.ts index 24ffdcbb6..cbf9b47b6 100644 --- a/packages/vue-code-gen/src/types.ts +++ b/packages/vue-code-gen/src/types.ts @@ -5,7 +5,6 @@ export interface TsMappingData { doRename?: (oldName: string, newName: string) => string, capabilities: { basic?: boolean, - extraHoverInfo?: boolean, references?: boolean, definitions?: boolean, diagnostic?: boolean,