From 398e5b284749ec269fa0f0ec5a42162f30c078f1 Mon Sep 17 00:00:00 2001 From: Vitaly Livshic Date: Wed, 13 Sep 2017 17:05:38 +0300 Subject: [PATCH] Add Go to line function --- src/dlangide/ui/commands.d | 2 ++ src/dlangide/ui/frame.d | 44 +++++++++++++++++++++++++++++--------- views/res/i18n/en.ini | 4 ++++ views/res/i18n/ru.ini | 4 ++++ 4 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d index f935b19..581c63c 100644 --- a/src/dlangide/ui/commands.d +++ b/src/dlangide/ui/commands.d @@ -62,6 +62,7 @@ enum IDEActions : int { GetCompletionSuggestions, GetDocComments, GetParenCompletion, + GotoLine, InsertCompletion, FindInFiles, @@ -143,5 +144,6 @@ const Action ACTION_GET_DOC_COMMENTS = (new Action(IDEActions.GetDocComments, " const Action ACTION_GO_TO_DEFINITION = (new Action(IDEActions.GoToDefinition, "GO_TO_DEFINITION"c, ""c, KeyCode.KEY_G, KeyFlag.Control)).addAccelerator(KeyCode.F12, 0).disableByDefault(); const Action ACTION_GET_COMPLETIONS = (new Action(IDEActions.GetCompletionSuggestions, "SHOW_COMPLETIONS"c, ""c, KeyCode.KEY_G, KeyFlag.Control|KeyFlag.Shift)).addAccelerator(KeyCode.SPACE, KeyFlag.Control).disableByDefault(); const Action ACTION_GET_PAREN_COMPLETION = (new Action(IDEActions.GetParenCompletion, "SHOW_PAREN_COMPLETION"c, ""c, KeyCode.SPACE, KeyFlag.Control|KeyFlag.Shift)).disableByDefault(); +const Action ACTION_GO_TO_LINE = (new Action(IDEActions.GotoLine, "GO_TO_LINE"c, ""c, KeyCode.KEY_L, KeyFlag.Control|KeyFlag.Option)).disableByDefault();; const Action ACTION_FIND_TEXT = (new Action(IDEActions.FindInFiles, "FIND_IN_FILES"c, "edit-find"c, KeyCode.KEY_F, KeyFlag.Control | KeyFlag.Shift)).disableByDefault(); diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d index 7762c5a..ed19890 100644 --- a/src/dlangide/ui/frame.d +++ b/src/dlangide/ui/frame.d @@ -220,17 +220,17 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL import std.file; stopExecution(); if (!project) { - window.showMessageBox(UIString.fromRaw("Cannot debug project"d), UIString.fromRaw("Startup project is not specified"d)); + window.showMessageBox(UIString.fromId("ERROR_CANNOT_DEBUG_PROJECT"c), UIString.fromId("ERROR_STARTUP_PROJECT_ABSENT"c)); return; } string executableFileName = project.executableFileName; if (!executableFileName || !exists(executableFileName) || !isFile(executableFileName)) { - window.showMessageBox(UIString.fromRaw("Cannot debug project"d), UIString.fromRaw("Cannot find executable file"d)); + window.showMessageBox(UIString.fromId("ERROR_CANNOT_DEBUG_PROJECT"c), UIString.fromId("ERROR_CANNOT_FIND_EXEC"c)); return; } string debuggerExecutable = _settings.debuggerExecutable; if (debuggerExecutable.empty) { - window.showMessageBox(UIString.fromRaw("Cannot debug project"d), UIString.fromRaw("No debugger executable specified in settings"d)); + window.showMessageBox(UIString.fromId("ERROR_CANNOT_DEBUG_PROJECT"c), UIString.fromId("ERROR_NO_DEBUGGER"c)); return; } @@ -250,7 +250,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL if (!project) project = currentWorkspace.startupProject; if (!project) { - window.showMessageBox(UIString.fromRaw("Cannot run project"d), UIString.fromRaw("Startup project is not specified"d)); + window.showMessageBox(UIString.fromId("ERROR_CANNOT_RUN_PROJECT"c), UIString.fromId("ERROR_CANNOT_RUN_PROJECT"c)); return; } buildProject(BuildOperation.Build, project, delegate(int result) { @@ -267,12 +267,12 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL import std.file; stopExecution(); if (!project) { - window.showMessageBox(UIString.fromRaw("Cannot run project"d), UIString.fromRaw("Startup project is not specified"d)); + window.showMessageBox(UIString.fromId("ERROR_CANNOT_RUN_PROJECT"c), UIString.fromId("ERROR_STARTUP_PROJECT_ABSENT"c)); return; } string executableFileName = project.executableFileName; if (!executableFileName || !exists(executableFileName) || !isFile(executableFileName)) { - window.showMessageBox(UIString.fromRaw("Cannot run project"d), UIString.fromRaw("Cannot find executable file"d)); + window.showMessageBox(UIString.fromId("ERROR_CANNOT_RUN_PROJECT"c), UIString.fromId("ERROR_CANNOT_FIND_EXEC"c)); return; } auto program = new ProgramExecutionNoDebug; @@ -582,7 +582,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL } string tabId = ed.id; // tab content is modified - ask for confirmation - auto header = UIString.fromRaw("HEADER_CLOSE_FILE"c); + auto header = UIString.fromId("HEADER_CLOSE_FILE"c); window.showMessageBox(header ~ " " ~ toUTF32(baseName(tabId)), UIString.fromId("MSG_FILE_CONTENT_CHANGED"c), [ACTION_SAVE, ACTION_SAVE_ALL, ACTION_DISCARD_CHANGES, ACTION_DISCARD_ALL, ACTION_CANCEL], 0, delegate(const Action result) { @@ -709,7 +709,9 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL editItem.add(ACTION_EDIT_PREFERENCES); MenuItem navItem = new MenuItem(new Action(21, "MENU_NAVIGATE")); - navItem.add(ACTION_GO_TO_DEFINITION, ACTION_GET_COMPLETIONS, ACTION_GET_DOC_COMMENTS, ACTION_GET_PAREN_COMPLETION, ACTION_EDITOR_GOTO_PREVIOUS_BOOKMARK, ACTION_EDITOR_GOTO_NEXT_BOOKMARK); + navItem.add(ACTION_GO_TO_DEFINITION, ACTION_GET_COMPLETIONS, ACTION_GET_DOC_COMMENTS, + ACTION_GET_PAREN_COMPLETION, ACTION_EDITOR_GOTO_PREVIOUS_BOOKMARK, + ACTION_EDITOR_GOTO_NEXT_BOOKMARK, ACTION_GO_TO_LINE); MenuItem projectItem = new MenuItem(new Action(21, "MENU_PROJECT")); projectItem.add(ACTION_PROJECT_SET_STARTUP, ACTION_PROJECT_REFRESH, ACTION_PROJECT_UPDATE_DEPENDENCIES, ACTION_PROJECT_SETTINGS); @@ -1070,6 +1072,28 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL currentEditor.editorTool.goToDefinition(currentEditor(), currentEditor.caretPos); } return true; + case IDEActions.GotoLine: + // Go to line without editor is meaningless command + if (currentEditor) { + Log.d("Go to line"); + // Ask user for line + window.showInputBox(UIString.fromId("GO_TO_LINE"c), UIString.fromId("GO_TO_LINE"c), ""d, delegate(dstring s) { + try { + auto num = to!uint(s); + // Check line existence + if (num < 1 || num > currentEditor.content.length) { + window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_NO_SUCH_LINE"c)); + return; + } + // Go to line + currentEditor.setCaretPos(num - 1, 0); + } + catch (ConvException e) { + window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_NUMBER"c)); + } + }); + } + return true; case IDEActions.GetDocComments: Log.d("Trying to get doc comments."); currentEditor.editorTool.getDocComments(currentEditor, currentEditor.caretPos, delegate(string[] results) { @@ -1224,8 +1248,8 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL Project project = srcfile.project; if (!project) return; - window.showMessageBox(UIString.fromRaw("Remove file"d), - UIString.fromRaw("Do you want to remove file "d ~ srcfile.name ~ "?"), + window.showMessageBox(UIString.fromId("HEADER_REMOVE_FILE"c), + UIString.fromId("QUESTION_REMOVE_FILE"c) ~ " " ~ srcfile.name ~ "?", [ACTION_YES, ACTION_NO], 1, delegate(const Action result) { if (result == StandardAction.Yes) { diff --git a/views/res/i18n/en.ini b/views/res/i18n/en.ini index 278f1ed..bc73334 100644 --- a/views/res/i18n/en.ini +++ b/views/res/i18n/en.ini @@ -61,6 +61,7 @@ GO_TO_DEFINITION=Go to definition SHOW_COMPLETIONS=Get autocompletions SHOW_DOC_COMMENTS=Show documentation SHOW_PAREN_COMPLETION=Call hints +GO_TO_LINE=Go to line FIND_IN_FILES=Find in files... @@ -171,10 +172,13 @@ OPTION_THEME=Theme OPTION_TOOLCHANS=Toolchains OPTION_USE_SPACES=Use spaces for tabs +ERROR=Error ERROR_CANNOT_DEBUG_PROJECT=Cannot debug project ERROR_STARTUP_PROJECT_ABSENT=Startup project is not specified +ERROR_INVALID_NUMBER=Invalid number ERROR_INVALID_WORKSPACE_FILE=Invalid workspace file ERROR_INVALID_WS_OR_PROJECT_FILE=This file is not a valid workspace or project file +ERROR_NO_SUCH_LINE=No such line ERROR_OPEN_FILE=File open error ERROR_OPEN_PROJECT=Cannot open project ERROR_OPEN_WORKSPACE=Cannot open workspace diff --git a/views/res/i18n/ru.ini b/views/res/i18n/ru.ini index 3f32da5..1c66b31 100644 --- a/views/res/i18n/ru.ini +++ b/views/res/i18n/ru.ini @@ -61,6 +61,7 @@ GO_TO_DEFINITION=Перейти к определению SHOW_COMPLETIONS=Автозавершение SHOW_DOC_COMMENTS=Показать документацию SHOW_PAREN_COMPLETION=Показать параметры вызова +GO_TO_LINE=Перейти к строке FIND_IN_FILES=Найти в файлах... @@ -170,10 +171,13 @@ OPTION_THEME=Тема оформления OPTION_TOOLCHANS=Наборы инструментов OPTION_USE_SPACES=Использовать пробелы вместо табуляции +ERROR=Ошибка ERROR_CANNOT_DEBUG_PROJECT=Невозможно отлаживать проект ERROR_STARTUP_PROJECT_ABSENT=Стартовый проект не указан +ERROR_INVALID_NUMBER=Неверное число ERROR_INVALID_WORKSPACE_FILE=Неверный файл раб.пространства ERROR_INVALID_WS_OR_PROJECT_FILE=Файл не является ни файлом раб.пространства, ни проектным +ERROR_NO_SUCH_LINE=Строка не существует ERROR_OPEN_FILE=Невозможно открыть файл ERROR_OPEN_PROJECT=Невозможно открыть проект ERROR_OPEN_WORKSPACE=Невозможно открыть рабочее пространство