Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 09:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

setting the right end line number

Browse Source
This commit is contained in:
Aiday Marlen Kyzy
2023-05-23 17:26:33 +02:00
parent c7b6e732e7
commit e5a37e8d5f
2 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/typescript-language-features/src/languageFeatures/documentSymbol.ts
View File

@@ -33,7 +33,7 @@ const getSymbolKind = (kind: string): vscode.SymbolKind => {
return vscode.SymbolKind.Variable;
};
class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
export class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
public constructor(
private readonly client: ITypeScriptServiceClient,
@@ -60,7 +60,7 @@ class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider
return result;
}
private static convertNavTree(
public static convertNavTree(
resource: vscode.Uri,
output: vscode.DocumentSymbol[],
item: Proto.NavigationTree,

55
extensions/typescript-language-features/src/languageFeatures/quickFix.ts
View File

@@ -35,6 +35,21 @@ class ApplyCodeActionCommand implements Command {
private readonly telemetryReporter: TelemetryReporter,
) { }
private findEndLine(startLine: number, navigationTree: Proto.NavigationTree[]): number {
for (const node of navigationTree) {
const nodeStartLine = node.spans[0].start.line;
const nodeEndLine = node.spans[0].end.line;
if (nodeStartLine === startLine) {
return nodeEndLine;
} else if (startLine > nodeStartLine && startLine <= nodeEndLine && node.childItems) {
return this.findEndLine(startLine, node.childItems);
}
}
return -1;
}
public async execute({ resource, action, diagnostic }: ApplyCodeActionCommand_args): Promise<boolean> {
/* __GDPR__
"quickFix.execute" : {
@@ -45,33 +60,39 @@ class ApplyCodeActionCommand implements Command {
]
}
*/
console.log('resource : ', resource);
console.log('action : ', action);
console.log('diagnostic : ', diagnostic);
this.telemetryReporter.logTelemetry('quickFix.execute', {
fixName: action.fixName
});
this.diagnosticManager.deleteDiagnostic(resource, diagnostic);
// TODO: point of interest
const codeActionResult = await applyCodeActionCommands(this.client, action.commands, nulToken);
// TODO: how to find the end line number of the class?
// const startLine = diagnostic.range.start.line;
// Find end line using the outline
// vscode.window.activeTextEditor?.document
const numberLines = vscode.window.activeTextEditor?.document.lineCount;
// once done, need to call the interactive editor, when working with the implentation interface case
if (action.fixName === 'fixClassIncorrectlyImplementsInterface') {
console.log('case when class incorrectly implements interface');
await vscode.commands.executeCommand('interactiveEditor.start', { initialRange: { startLineNumber: 0, endLineNumber: numberLines, startColumn: 0, endColumn: 0 }, message: 'Implement the class from the interface', autoSend: true });
}
//
return codeActionResult;
const diagnosticStartLine = diagnostic.range.start.line + 1;
const document = vscode.window.activeTextEditor?.document;
if (document) {
const filepath = this.client.toOpenTsFilePath(document);
if (filepath) {
const cancellationTokenSource = new vscode.CancellationTokenSource();
const response = await this.client.execute('navtree', { file: filepath }, cancellationTokenSource.token);
if (response.type === 'response' && response.body?.childItems) {
const endLineFound = this.findEndLine(diagnosticStartLine, response.body.childItems);
const endLine = endLineFound !== -1 ? endLineFound : vscode.window.activeTextEditor?.document.lineCount;
const startLine = endLineFound !== -1 ? diagnosticStartLine : 0;
await vscode.commands.executeCommand('interactiveEditor.start', { initialRange: { startLineNumber: startLine, endLineNumber: endLine, startColumn: 0, endColumn: 0 }, message: 'Implement the class using the interface', autoSend: true });
}
}
}
return codeActionResult;
}
return false;
}
}