Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-12 01:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverting changes in the typescript extension

Browse Source
This commit is contained in:
Aiday Marlen Kyzy
2023-11-21 15:08:54 +01:00
parent bc4dc881ba
commit ec839f23bf
2 changed files with 10 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/typescript-language-features/src/languageFeatures/documentSymbol.ts
+2 -2
View File
@@ -12,7 +12,7 @@ import * as PConst from '../tsServer/protocol/protocol.const';
import * as typeConverters from '../typeConverters';
import { ITypeScriptServiceClient } from '../typescriptService';
export const getSymbolKind = (kind: string): vscode.SymbolKind => {
const getSymbolKind = (kind: string): vscode.SymbolKind => {
switch (kind) {
case PConst.Kind.module: return vscode.SymbolKind.Module;
case PConst.Kind.class: return vscode.SymbolKind.Class;
@@ -33,7 +33,7 @@ export const getSymbolKind = (kind: string): vscode.SymbolKind => {
return vscode.SymbolKind.Variable;
};
export class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
public constructor(
private readonly client: ITypeScriptServiceClient,
extensions/typescript-language-features/src/languageFeatures/refactor.ts
+8 -72
View File
@@ -21,7 +21,6 @@ import { nulToken } from '../utils/cancellation';
import FormattingOptionsManager from './fileConfigurationManager';
import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
import { EditorChatFollowUp, EditorChatFollowUp_Args, CompositeCommand } from './util/copilot';
import { getSymbolKind } from './documentSymbol';
function toWorkspaceEdit(client: ITypeScriptServiceClient, edits: readonly Proto.FileCodeEdits[]): vscode.WorkspaceEdit {
const workspaceEdit = new vscode.WorkspaceEdit();
@@ -436,48 +435,6 @@ class MoveToFileCodeAction extends vscode.CodeAction {
arguments: [<MoveToFileRefactorCommand.Args>{ action, document, range }]
};
}
private static readonly _scopesOfInterest = [
vscode.SymbolKind.File,
vscode.SymbolKind.Module,
vscode.SymbolKind.Namespace,
vscode.SymbolKind.Package,
vscode.SymbolKind.Class,
vscode.SymbolKind.Interface,
];
private static _findSmallestNavTreeContaining(
navigationTree: Proto.NavigationTree,
range: vscode.Range
): Proto.NavigationTree {
const childTrees = navigationTree.childItems;
if (!childTrees) {
return navigationTree;
}
for (const childTree of childTrees) {
if (MoveToFileCodeAction._navTreeContainsRange(childTree, range) && MoveToFileCodeAction._scopesOfInterest.includes(getSymbolKind(childTree.kind))) {
return this._findSmallestNavTreeContaining(childTree, range);
}
}
return navigationTree;
}
private static _navTreeContainsRange(navigationTree: Proto.NavigationTree, range: vscode.Range): boolean {
return navigationTree.spans.some(span => typeConverters.Range.fromTextSpan(span).contains(range));
}
public static shouldIncludeMoveToAction(
navigationTree: Proto.NavigationTree | undefined,
range: vscode.Range
): boolean {
if (!navigationTree || !MoveToFileCodeAction._navTreeContainsRange(navigationTree, range)) {
return false;
}
const smallestScopeContaining = MoveToFileCodeAction._findSmallestNavTreeContaining(navigationTree, range);
return !!(smallestScopeContaining
&& smallestScopeContaining.spans[0].start.line - 1 === range.start.line
&& smallestScopeContaining.spans[smallestScopeContaining.spans.length - 1].end.line - 1 === range.end.line);
}
}
class SelectCodeAction extends vscode.CodeAction {
@@ -559,8 +516,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
return undefined;
}
const applicableRefactors = await this.convertApplicableRefactors(document, response.body, rangeOrSelection);
const actions = await Promise.all(applicableRefactors.map(async (action) => {
const actions = Array.from(this.convertApplicableRefactors(document, response.body, rangeOrSelection)).filter(action => {
if (this.client.apiVersion.lt(API.v430)) {
// Don't show 'infer return type' refactoring unless it has been explicitly requested
// https://github.com/microsoft/TypeScript/issues/42993
@@ -568,15 +524,8 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
return false;
}
}
if (action.kind?.value === Move_NewFile.kind.value) {
const navigationTree = await this.client.execute('navtree', { file: document.uri.path }, nulToken);
if (navigationTree.type !== 'response') {
return;
}
return MoveToFileCodeAction.shouldIncludeMoveToAction(navigationTree.body, rangeOrSelection);
}
return true;
})).then((mappedRefactors) => applicableRefactors.filter((_, index) => mappedRefactors[index]));
});
if (!context.only) {
return actions;
@@ -598,44 +547,31 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
return context.triggerKind === vscode.CodeActionTriggerKind.Invoke ? 'invoked' : 'implicit';
}
private async convertApplicableRefactors(
private *convertApplicableRefactors(
document: vscode.TextDocument,
refactors: readonly Proto.ApplicableRefactorInfo[],
rangeOrSelection: vscode.Range | vscode.Selection
): Promise<Array<TsCodeAction>> {
const actions: Array<TsCodeAction> = [];
): Iterable<TsCodeAction> {
for (const refactor of refactors) {
if (refactor.inlineable === false) {
actions.push(new SelectCodeAction(refactor, document, rangeOrSelection));
yield new SelectCodeAction(refactor, document, rangeOrSelection);
} else {
for (const action of refactor.actions) {
const refactorAction = await this.refactorActionToCodeAction(document, refactor, action, rangeOrSelection, refactor.actions);
if (refactorAction) {
actions.push(refactorAction);
}
yield this.refactorActionToCodeAction(document, refactor, action, rangeOrSelection, refactor.actions);
}
}
}
return actions;
}
private async refactorActionToCodeAction(
private refactorActionToCodeAction(
document: vscode.TextDocument,
refactor: Proto.ApplicableRefactorInfo,
action: Proto.RefactorActionInfo,
rangeOrSelection: vscode.Range | vscode.Selection,
allActions: readonly Proto.RefactorActionInfo[],
): Promise<TsCodeAction | undefined> {
): TsCodeAction {
let codeAction: TsCodeAction;
if (action.name === 'Move to file') {
const navigationTree = await this.client.execute('navtree', { file: document.uri.path }, nulToken);
if (navigationTree.type !== 'response') {
return;
}
const shouldIncludeMoveToAction = MoveToFileCodeAction.shouldIncludeMoveToAction(navigationTree.body, rangeOrSelection);
if (!shouldIncludeMoveToAction) {
return;
}
codeAction = new MoveToFileCodeAction(document, action, rangeOrSelection);
} else {
let copilotRename: ((info: Proto.RefactorEditInfo) => vscode.Command) | undefined;