Skip to content

fix and enhance navigateToFile #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renkun-ken merged 2 commits into from
Oct 27, 2020
+63 −64
Merged

fix and enhance navigateToFile #430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4fbfd8
fix and enhance navigateToFile
MilesMcBain Oct 26, 2020
f373936
fix toString -> toString()
MilesMcBain Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 63 additions & 64 deletions src/rstudioapi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,65 +14,65 @@ let lastActiveTextEditor: TextEditor;
export async function dispatchRStudioAPICall(action: string, args: any, sd: string) {

switch (action) {
case 'active_editor_context': {
await writeResponse(await activeEditorContext(), sd);
break;
}
case 'insert_or_modify_text': {
await insertOrModifyText(args.query, args.id);
await writeSuccessResponse(sd);
break;
}
case 'replace_text_in_current_selection': {
await replaceTextInCurrentSelection(args.text, args.id);
await writeSuccessResponse(sd);
break;
}
case 'show_dialog': {
await showDialog(args.message);
await writeSuccessResponse(sd);
break;
}
case 'navigate_to_file': {
await navigateToFile(args.file, args.line, args.column);
await writeSuccessResponse(sd);
break;
}
case 'set_selection_ranges': {
await setSelections(args.ranges, args.id);
await writeSuccessResponse(sd);
break;
}
case 'document_save': {
await documentSave(args.id);
await writeSuccessResponse(sd);
break;
}
case 'document_save_all': {
await documentSaveAll();
await writeSuccessResponse(sd);
break;
}
case 'get_project_path': {
await writeResponse(projectPath(), sd);
break;
}
case 'document_context': {
await writeResponse(await documentContext(args.id), sd);
break;
}
case 'document_new': {
await documentNew(args.text, args.type, args.position);
await writeSuccessResponse(sd);
break;
}
case 'restart_r': {
await restartRTerminal();
await writeSuccessResponse(sd);
break;
}
default:
console.error(`[dispatchRStudioAPICall] Unsupported action: ${action}`);
case 'active_editor_context': {
await writeResponse(await activeEditorContext(), sd);
break;
}
case 'insert_or_modify_text': {
await insertOrModifyText(args.query, args.id);
await writeSuccessResponse(sd);
break;
}
case 'replace_text_in_current_selection': {
await replaceTextInCurrentSelection(args.text, args.id);
await writeSuccessResponse(sd);
break;
}
case 'show_dialog': {
await showDialog(args.message);
await writeSuccessResponse(sd);
break;
}
case 'navigate_to_file': {
await navigateToFile(args.file, args.line, args.column);
await writeSuccessResponse(sd);
break;
}
case 'set_selection_ranges': {
await setSelections(args.ranges, args.id);
await writeSuccessResponse(sd);
break;
}
case 'document_save': {
await documentSave(args.id);
await writeSuccessResponse(sd);
break;
}
case 'document_save_all': {
await documentSaveAll();
await writeSuccessResponse(sd);
break;
}
case 'get_project_path': {
await writeResponse(projectPath(), sd);
break;
}
case 'document_context': {
await writeResponse(await documentContext(args.id), sd);
break;
}
case 'document_new': {
await documentNew(args.text, args.type, args.position);
await writeSuccessResponse(sd);
break;
}
case 'restart_r': {
await restartRTerminal();
await writeSuccessResponse(sd);
break;
}
default:
console.error(`[dispatchRStudioAPICall] Unsupported action: ${action}`);
}

}
Expand Down Expand Up @@ -155,10 +155,9 @@ export async function navigateToFile(file: string, line: number, column: number)

const targetDocument = await workspace.openTextDocument(Uri.file(file));
const editor = await window.showTextDocument(targetDocument);
if (line > 0 && column > 0) {
const targetPosition = parsePosition([toVSCCoord(line), toVSCCoord(column)], targetDocument);
editor.selection = new Selection(targetPosition, targetPosition);
}
const targetPosition = parsePosition([line, column], targetDocument);
editor.selection = new Selection(targetPosition, targetPosition);
editor.revealRange(new Range(targetPosition, targetPosition));
}

export async function setSelections(ranges: number[][], id: string) {
Expand Down Expand Up @@ -417,7 +416,7 @@ async function reuseOrCreateEditor(targetDocument: TextDocument) {


const matchingTextEditors = KnownEditors.filter((editor) =>
editor.document.uri.toString === targetDocument.uri.toString);
editor.document.uri.toString() === targetDocument.uri.toString());

if (matchingTextEditors.length === 0) {
const newEditor = await window.showTextDocument(
Expand Down