forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Converted tabs to spaces

This commit is contained in:
Marco de Wild 2017-12-29 14:17:13 +01:00
parent 92990e5352
commit bf04e91293
3 changed files with 422 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

390
src/dlangide/ui/frame.d
View File

@ -149,25 +149,25 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
/// called when program execution is stopped /// called when program execution is stopped
protected void onProgramExecutionStatus(ProgramExecution process, ExecutionStatus status, int exitCode) { protected void onProgramExecutionStatus(ProgramExecution process, ExecutionStatus status, int exitCode) {
executeInUiThread(delegate() { executeInUiThread(delegate() {
Log.d("onProgramExecutionStatus process: ", process.executableFile, " status: ", status, " exitCode: ", exitCode); Log.d("onProgramExecutionStatus process: ", process.executableFile, " status: ", status, " exitCode: ", exitCode);
_execution = null; _execution = null;
// TODO: update state // TODO: update state
switch(status) { switch(status) {
case ExecutionStatus.Error: case ExecutionStatus.Error:
_logPanel.logLine("Cannot run program " ~ process.executableFile); _logPanel.logLine("Cannot run program " ~ process.executableFile);
break; break;
case ExecutionStatus.Finished: case ExecutionStatus.Finished:
_logPanel.logLine("Program " ~ process.executableFile ~ " finished with exit code " ~ to!string(exitCode)); _logPanel.logLine("Program " ~ process.executableFile ~ " finished with exit code " ~ to!string(exitCode));
break; break;
case ExecutionStatus.Killed: case ExecutionStatus.Killed:
_logPanel.logLine("Program " ~ process.executableFile ~ " is killed"); _logPanel.logLine("Program " ~ process.executableFile ~ " is killed");
break; break;
default: default:
_logPanel.logLine("Program " ~ process.executableFile ~ " is finished"); _logPanel.logLine("Program " ~ process.executableFile ~ " is finished");
break; break;
} }
_statusLine.setBackgroundOperationStatus(null, null); _statusLine.setBackgroundOperationStatus(null, null);
}); });
} }
protected void handleBuildError(int result, Project project) { protected void handleBuildError(int result, Project project) {
@ -187,13 +187,13 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
return; return;
} }
buildProject(BuildOperation.Build, project, delegate(int result) { buildProject(BuildOperation.Build, project, delegate(int result) {
if (!result) { if (!result) {
Log.i("Build completed successfully. Starting debug for project."); Log.i("Build completed successfully. Starting debug for project.");
debugProject(project); debugProject(project);
} else { } else {
handleBuildError(result, project); handleBuildError(result, project);
} }
}); });
} }
void debugFinished(ProgramExecution process, ExecutionStatus status, int exitCode) { void debugFinished(ProgramExecution process, ExecutionStatus status, int exitCode) {
@ -256,13 +256,13 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
return; return;
} }
buildProject(BuildOperation.Build, project, delegate(int result) { buildProject(BuildOperation.Build, project, delegate(int result) {
if (!result) { if (!result) {
Log.i("Build completed successfully. Running program..."); Log.i("Build completed successfully. Running program...");
runProject(project); runProject(project);
} else { } else {
handleBuildError(result, project); handleBuildError(result, project);
} }
}); });
} }
protected void runProject(Project project) { protected void runProject(Project project) {
@ -417,12 +417,12 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
} }
} }
bool tryOpenSourceFile(string filename) { bool tryOpenSourceFile(string filename) {
if (isSupportedSourceTextFileFormat(filename)) { if (isSupportedSourceTextFileFormat(filename)) {
return openSourceFile(filename, null, true); return openSourceFile(filename, null, true);
} }
return false; return false;
} }
bool openSourceFile(string filename, ProjectSourceFile file = null, bool activate = true) { bool openSourceFile(string filename, ProjectSourceFile file = null, bool activate = true) {
if (!file && !filename) if (!file && !filename)
@ -495,7 +495,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
HomeScreen home = new HomeScreen(HOME_SCREEN_ID, this); HomeScreen home = new HomeScreen(HOME_SCREEN_ID, this);
_tabs.addTab(home, UIString.fromId("HOME"c), null, true); _tabs.addTab(home, UIString.fromId("HOME"c), null, true);
_tabs.selectTab(HOME_SCREEN_ID, true); _tabs.selectTab(HOME_SCREEN_ID, true);
auto _settings = new IDESettings(buildNormalizedPath(settingsDir, "settings.json")); auto _settings = new IDESettings(buildNormalizedPath(settingsDir, "settings.json"));
// Auto open last workspace, if no workspace specified in command line and autoOpen flag set to true // Auto open last workspace, if no workspace specified in command line and autoOpen flag set to true
const auto recentWorkspaces = settings.recentWorkspaces; const auto recentWorkspaces = settings.recentWorkspaces;
if (!openedWorkspace && recentWorkspaces.length > 0 && _settings.autoOpenLastProject()) if (!openedWorkspace && recentWorkspaces.length > 0 && _settings.autoOpenLastProject())
@ -611,35 +611,35 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
// tab content is modified - ask for confirmation // tab content is modified - ask for confirmation
auto header = UIString.fromId("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), 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], [ACTION_SAVE, ACTION_SAVE_ALL, ACTION_DISCARD_CHANGES, ACTION_DISCARD_ALL, ACTION_CANCEL],
0, delegate(const Action result) { 0, delegate(const Action result) {
if (result == StandardAction.Save) { if (result == StandardAction.Save) {
// save and close // save and close
ed.save(); ed.save();
askForUnsavedEdits(onConfirm); askForUnsavedEdits(onConfirm);
} else if (result == StandardAction.DiscardChanges) { } else if (result == StandardAction.DiscardChanges) {
// close, don't save // close, don't save
closeTab(tabId); closeTab(tabId);
closeAllDocuments(); closeAllDocuments();
onConfirm(); onConfirm();
} else if (result == StandardAction.SaveAll) { } else if (result == StandardAction.SaveAll) {
ed.save(); ed.save();
for(;;) { for(;;) {
DSourceEdit editor = hasUnsavedEdits(); DSourceEdit editor = hasUnsavedEdits();
if (!editor) if (!editor)
break; break;
editor.save(); editor.save();
} }
closeAllDocuments(); closeAllDocuments();
onConfirm(); onConfirm();
} else if (result == StandardAction.DiscardAll) { } else if (result == StandardAction.DiscardAll) {
// close, don't save // close, don't save
closeAllDocuments(); closeAllDocuments();
onConfirm(); onConfirm();
} }
// else ignore // else ignore
return true; return true;
}); });
} }
protected void onTabClose(string tabId) { protected void onTabClose(string tabId) {
@ -650,19 +650,19 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
if (d && d.content.modified) { if (d && d.content.modified) {
// tab content is modified - ask for confirmation // tab content is modified - ask for confirmation
window.showMessageBox(UIString.fromId("HEADER_CLOSE_TAB"c), UIString.fromId("MSG_TAB_CONTENT_CHANGED"c) ~ ": " ~ toUTF32(baseName(tabId)), window.showMessageBox(UIString.fromId("HEADER_CLOSE_TAB"c), UIString.fromId("MSG_TAB_CONTENT_CHANGED"c) ~ ": " ~ toUTF32(baseName(tabId)),
[ACTION_SAVE, ACTION_DISCARD_CHANGES, ACTION_CANCEL], [ACTION_SAVE, ACTION_DISCARD_CHANGES, ACTION_CANCEL],
0, delegate(const Action result) { 0, delegate(const Action result) {
if (result == StandardAction.Save) { if (result == StandardAction.Save) {
// save and close // save and close
d.save(); d.save();
closeTab(tabId); closeTab(tabId);
} else if (result == StandardAction.DiscardChanges) { } else if (result == StandardAction.DiscardChanges) {
// close, don't save // close, don't save
closeTab(tabId); closeTab(tabId);
} }
// else ignore // else ignore
return true; return true;
}); });
} else { } else {
closeTab(tabId); closeTab(tabId);
} }
@ -745,11 +745,11 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
fileNewItem.add(ACTION_FILE_NEW_SOURCE_FILE, ACTION_FILE_NEW_WORKSPACE, ACTION_FILE_NEW_PROJECT); fileNewItem.add(ACTION_FILE_NEW_SOURCE_FILE, ACTION_FILE_NEW_WORKSPACE, ACTION_FILE_NEW_PROJECT);
fileItem.add(fileNewItem); fileItem.add(fileNewItem);
fileItem.add(ACTION_FILE_OPEN_WORKSPACE, ACTION_FILE_OPEN, fileItem.add(ACTION_FILE_OPEN_WORKSPACE, ACTION_FILE_OPEN,
ACTION_FILE_SAVE, ACTION_FILE_SAVE_AS, ACTION_FILE_SAVE_ALL, ACTION_FILE_WORKSPACE_CLOSE, ACTION_FILE_EXIT); ACTION_FILE_SAVE, ACTION_FILE_SAVE_AS, ACTION_FILE_SAVE_ALL, ACTION_FILE_WORKSPACE_CLOSE, ACTION_FILE_EXIT);
MenuItem editItem = new MenuItem(new Action(2, "MENU_EDIT")); MenuItem editItem = new MenuItem(new Action(2, "MENU_EDIT"));
editItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, editItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE,
ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO); ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO);
editItem.addSeparator(); editItem.addSeparator();
editItem.add(ACTION_EDITOR_FIND, ACTION_EDITOR_FIND_NEXT, ACTION_EDITOR_FIND_PREV, ACTION_EDITOR_REPLACE, ACTION_FIND_TEXT, ACTION_EDITOR_TOGGLE_BOOKMARK); editItem.add(ACTION_EDITOR_FIND, ACTION_EDITOR_FIND_NEXT, ACTION_EDITOR_FIND_PREV, ACTION_EDITOR_REPLACE, ACTION_FIND_TEXT, ACTION_EDITOR_TOGGLE_BOOKMARK);
editItem.addSeparator(); editItem.addSeparator();
@ -800,18 +800,18 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
buildItem.addSeparator(); buildItem.addSeparator();
buildItem.add(ACTION_WORKSPACE_BUILD, ACTION_WORKSPACE_REBUILD, ACTION_WORKSPACE_CLEAN, buildItem.add(ACTION_WORKSPACE_BUILD, ACTION_WORKSPACE_REBUILD, ACTION_WORKSPACE_CLEAN,
ACTION_PROJECT_BUILD, ACTION_PROJECT_REBUILD, ACTION_PROJECT_CLEAN, ACTION_PROJECT_BUILD, ACTION_PROJECT_REBUILD, ACTION_PROJECT_CLEAN,
ACTION_RUN_WITH_RDMD); ACTION_RUN_WITH_RDMD);
MenuItem debugItem = new MenuItem(new Action(23, "MENU_DEBUG")); MenuItem debugItem = new MenuItem(new Action(23, "MENU_DEBUG"));
debugItem.add(ACTION_DEBUG_START, ACTION_DEBUG_START_NO_DEBUG, debugItem.add(ACTION_DEBUG_START, ACTION_DEBUG_START_NO_DEBUG,
ACTION_DEBUG_CONTINUE, ACTION_DEBUG_STOP, ACTION_DEBUG_PAUSE, ACTION_DEBUG_CONTINUE, ACTION_DEBUG_STOP, ACTION_DEBUG_PAUSE,
ACTION_DEBUG_RESTART, ACTION_DEBUG_RESTART,
ACTION_DEBUG_STEP_INTO, ACTION_DEBUG_STEP_INTO,
ACTION_DEBUG_STEP_OVER, ACTION_DEBUG_STEP_OVER,
ACTION_DEBUG_STEP_OUT, ACTION_DEBUG_STEP_OUT,
ACTION_DEBUG_TOGGLE_BREAKPOINT, ACTION_DEBUG_ENABLE_BREAKPOINT, ACTION_DEBUG_DISABLE_BREAKPOINT ACTION_DEBUG_TOGGLE_BREAKPOINT, ACTION_DEBUG_ENABLE_BREAKPOINT, ACTION_DEBUG_DISABLE_BREAKPOINT
); );
MenuItem toolsItem = new MenuItem(new Action(33, "MENU_TOOLS"c)); MenuItem toolsItem = new MenuItem(new Action(33, "MENU_TOOLS"c));
@ -881,14 +881,14 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
tb = res.getOrAddToolbar("Edit"); tb = res.getOrAddToolbar("Edit");
tb.addButtons(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_SEPARATOR, tb.addButtons(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_SEPARATOR,
ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT); ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT);
tb = res.getOrAddToolbar("Debug"); tb = res.getOrAddToolbar("Debug");
tb.addButtons(ACTION_DEBUG_STOP, ACTION_DEBUG_CONTINUE, ACTION_DEBUG_PAUSE, tb.addButtons(ACTION_DEBUG_STOP, ACTION_DEBUG_CONTINUE, ACTION_DEBUG_PAUSE,
ACTION_DEBUG_RESTART, ACTION_DEBUG_RESTART,
ACTION_DEBUG_STEP_INTO, ACTION_DEBUG_STEP_INTO,
ACTION_DEBUG_STEP_OVER, ACTION_DEBUG_STEP_OVER,
ACTION_DEBUG_STEP_OUT, ACTION_DEBUG_STEP_OUT,
); );
return res; return res;
} }
@ -1039,7 +1039,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_FAILED_TO_PARSE_FILE"c)); window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_FAILED_TO_PARSE_FILE"c));
} }
} }
); );
setBackgroundOperation(op); setBackgroundOperation(op);
} }
@ -1092,9 +1092,9 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
//} //}
dstring msg = "DLangIDE\n(C) Vadim Lopatin, 2014-2017\nhttp://github.com/buggins/dlangide\n" dstring msg = "DLangIDE\n(C) Vadim Lopatin, 2014-2017\nhttp://github.com/buggins/dlangide\n"
~ "IDE for D programming language written in D\nUses DlangUI library " ~ "IDE for D programming language written in D\nUses DlangUI library "
~ DLANGUI_VERSION ~ " for GUI"d; ~ DLANGUI_VERSION ~ " for GUI"d;
window.showMessageBox(UIString.fromId("ABOUT"c) ~ " " ~ DLANGIDE_VERSION, window.showMessageBox(UIString.fromId("ABOUT"c) ~ " " ~ DLANGIDE_VERSION,
UIString.fromRaw(msg)); UIString.fromRaw(msg));
return true; return true;
case IDEActions.BuildSetConfiguration: case IDEActions.BuildSetConfiguration:
// set build configuration // set build configuration
@ -1227,8 +1227,8 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
return true; return true;
case IDEActions.WindowCloseAllDocuments: case IDEActions.WindowCloseAllDocuments:
askForUnsavedEdits(delegate() { askForUnsavedEdits(delegate() {
closeAllDocuments(); closeAllDocuments();
}); });
return true; return true;
case IDEActions.WindowShowHomeScreen: case IDEActions.WindowShowHomeScreen:
showHomeScreen(); showHomeScreen();
@ -1293,31 +1293,31 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
Log.d("Go to line"); Log.d("Go to line");
// Ask user for line // Ask user for line
window.showInputBox(UIString.fromId("GO_TO_LINE"c), UIString.fromId("GO_TO_LINE"c), ""d, delegate(dstring s) { window.showInputBox(UIString.fromId("GO_TO_LINE"c), UIString.fromId("GO_TO_LINE"c), ""d, delegate(dstring s) {
try { try {
auto num = to!uint(s); auto num = to!uint(s);
// Check line existence // Check line existence
if (num < 1 || num > currentEditor.content.length) { if (num < 1 || num > currentEditor.content.length) {
currentEditor.setFocus();
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_NO_SUCH_LINE"c));
return;
}
// Go to line
currentEditor.setCaretPos(num - 1, 0);
currentEditor.setFocus(); currentEditor.setFocus();
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_NO_SUCH_LINE"c));
return;
} }
// Go to line catch (ConvException e) {
currentEditor.setCaretPos(num - 1, 0); currentEditor.setFocus();
currentEditor.setFocus(); window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_NUMBER"c));
} }
catch (ConvException e) { });
currentEditor.setFocus();
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_NUMBER"c));
}
});
} }
return true; return true;
case IDEActions.GetDocComments: case IDEActions.GetDocComments:
Log.d("Trying to get doc comments."); Log.d("Trying to get doc comments.");
currentEditor.editorTool.getDocComments(currentEditor, currentEditor.caretPos, delegate(string[] results) { currentEditor.editorTool.getDocComments(currentEditor, currentEditor.caretPos, delegate(string[] results) {
if (results.length) if (results.length)
currentEditor.showDocCommentsPopup(results); currentEditor.showDocCommentsPopup(results);
}); });
return true; return true;
case IDEActions.GetParenCompletion: case IDEActions.GetParenCompletion:
Log.d("Trying to get paren completion."); Log.d("Trying to get paren completion.");
@ -1326,9 +1326,9 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
case IDEActions.GetCompletionSuggestions: case IDEActions.GetCompletionSuggestions:
Log.d("Getting auto completion suggestions."); Log.d("Getting auto completion suggestions.");
currentEditor.editorTool.getCompletions(currentEditor, currentEditor.caretPos, delegate(dstring[] results, string[] icons, CompletionTypes type) { currentEditor.editorTool.getCompletions(currentEditor, currentEditor.caretPos, delegate(dstring[] results, string[] icons, CompletionTypes type) {
if (currentEditor) if (currentEditor)
currentEditor.showCompletionPopup(results, icons, type); currentEditor.showCompletionPopup(results, icons, type);
}); });
return true; return true;
case IDEActions.EditPreferences: case IDEActions.EditPreferences:
showPreferences(); showPreferences();
@ -1414,9 +1414,9 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
currentWorkspace.save(); currentWorkspace.save();
} }
askForUnsavedEdits(delegate() { askForUnsavedEdits(delegate() {
setWorkspace(null); setWorkspace(null);
showHomeScreen(); showHomeScreen();
}); });
} }
void onBreakpointListChanged(ProjectSourceFile sourcefile, Breakpoint[] breakpoints) { void onBreakpointListChanged(ProjectSourceFile sourcefile, Breakpoint[] breakpoints) {
@ -1477,24 +1477,24 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
if (!project) if (!project)
return; return;
window.showMessageBox(UIString.fromId("HEADER_REMOVE_FILE"c), window.showMessageBox(UIString.fromId("HEADER_REMOVE_FILE"c),
UIString.fromId("QUESTION_REMOVE_FILE"c) ~ " " ~ srcfile.name ~ "?", UIString.fromId("QUESTION_REMOVE_FILE"c) ~ " " ~ srcfile.name ~ "?",
[ACTION_YES, ACTION_NO], [ACTION_YES, ACTION_NO],
1, delegate(const Action result) { 1, delegate(const Action result) {
if (result == StandardAction.Yes) { if (result == StandardAction.Yes) {
// save and close // save and close
import std.file : remove; import std.file : remove;
closeTab(srcfile.filename); closeTab(srcfile.filename);
try { try {
remove(srcfile.filename); remove(srcfile.filename);
} catch (Exception e) { } catch (Exception e) {
Log.e("Cannot remove file"); Log.e("Cannot remove file");
}
project.refresh();
updateTreeGraph();
} }
// else ignore project.refresh();
return true; updateTreeGraph();
}); }
// else ignore
return true;
});
} }
@ -1508,7 +1508,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
//res.project.reload(); //res.project.reload();
res.project.refresh(); res.project.refresh();
updateTreeGraph(); updateTreeGraph();
tryOpenSourceFile(res.filename); tryOpenSourceFile(res.filename);
} }
} }
}; };
@ -1527,11 +1527,11 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
ProjectFolder newFolder = new ProjectFolder(res.filename); ProjectFolder newFolder = new ProjectFolder(res.filename);
if(folder) { if(folder) {
folder.addChild(newFolder); folder.addChild(newFolder);
folder.sortItems; folder.sortItems;
newFolder.refresh(); newFolder.refresh();
if(newFolder.childCount > 0){ if(newFolder.childCount > 0){
tryOpenSourceFile(newFolder.child(0).filename); tryOpenSourceFile(newFolder.child(0).filename);
} }
} }
updateTreeGraph(); updateTreeGraph();
} }
@ -1723,21 +1723,21 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
WorkspaceFile[] files = currentWorkspace.files(); WorkspaceFile[] files = currentWorkspace.files();
for (int i; i < files.length; i++) for (int i; i < files.length; i++)
with (files[i]) with (files[i])
{
// Opening file
if (openSourceFile(filename))
{ {
// Opening file auto index = _tabs.tabIndex(filename);
if (openSourceFile(filename)) if (index < 0)
{ continue;
auto index = _tabs.tabIndex(filename); // file is opened in tab
if (index < 0) auto source = cast(DSourceEdit)_tabs.tabBody(filename);
continue; if (!source)
// file is opened in tab continue;
auto source = cast(DSourceEdit)_tabs.tabBody(filename); // Caret position
if (!source) source.setCaretPos(column, row, true, true);
continue;
// Caret position
source.setCaretPos(column, row, true, true);
}
} }
}
} }
void saveListOfOpenedFiles() { void saveListOfOpenedFiles() {
@ -1764,12 +1764,12 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
Workspace ws = new Workspace(this); Workspace ws = new Workspace(this);
if (ws.load(filename)) { if (ws.load(filename)) {
askForUnsavedEdits(delegate() { askForUnsavedEdits(delegate() {
setWorkspace(ws); setWorkspace(ws);
hideHomeScreen(); hideHomeScreen();
// Write workspace to recent workspaces list // Write workspace to recent workspaces list
_settings.updateRecentWorkspace(filename); _settings.updateRecentWorkspace(filename);
restoreListOfOpenedFiles(); restoreListOfOpenedFiles();
}); });
} else { } else {
window.showMessageBox(UIString.fromId("ERROR_OPEN_WORKSPACE"c).value, UIString.fromId("ERROR_OPENING_WORKSPACE"c).value); window.showMessageBox(UIString.fromId("ERROR_OPEN_WORKSPACE"c).value, UIString.fromId("ERROR_OPENING_WORKSPACE"c).value);
return; return;
@ -1794,21 +1794,21 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
} }
window.showMessageBox(UIString.fromId("MSG_OPEN_PROJECT"c), UIString.fromId("QUESTION_NEW_WORKSPACE"c), window.showMessageBox(UIString.fromId("MSG_OPEN_PROJECT"c), UIString.fromId("QUESTION_NEW_WORKSPACE"c),
[ACTION_ADD_TO_CURRENT_WORKSPACE, ACTION_CREATE_NEW_WORKSPACE, ACTION_CANCEL], 0, delegate(const Action result) { [ACTION_ADD_TO_CURRENT_WORKSPACE, ACTION_CREATE_NEW_WORKSPACE, ACTION_CANCEL], 0, delegate(const Action result) {
if (result.id == IDEActions.CreateNewWorkspace) { if (result.id == IDEActions.CreateNewWorkspace) {
// new ws // new ws
createNewWorkspaceForExistingProject(project); createNewWorkspaceForExistingProject(project);
hideHomeScreen(); hideHomeScreen();
} else if (result.id == IDEActions.AddToCurrentWorkspace) { } else if (result.id == IDEActions.AddToCurrentWorkspace) {
// add to current // add to current
currentWorkspace.addProject(project); currentWorkspace.addProject(project);
loadProject(project); loadProject(project);
currentWorkspace.save(); currentWorkspace.save();
updateTreeGraph(); updateTreeGraph();
hideHomeScreen(); hideHomeScreen();
} }
return true; return true;
}); });
} else { } else {
// new workspace file // new workspace file
createNewWorkspaceForExistingProject(project); createNewWorkspaceForExistingProject(project);
@ -1951,10 +1951,10 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
} }
Builder op = new Builder(this, project, _logPanel, project.projectConfiguration, currentWorkspace.buildConfiguration, buildOp, Builder op = new Builder(this, project, _logPanel, project.projectConfiguration, currentWorkspace.buildConfiguration, buildOp,
dubExecutable, dubAdditionalParams, dubExecutable, dubAdditionalParams,
toolchain, toolchain,
arch, arch,
listener); listener);
setBackgroundOperation(op); setBackgroundOperation(op);
} }
@ -2013,12 +2013,12 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
/// return false to prevent closing /// return false to prevent closing
bool onCanClose() { bool onCanClose() {
askForUnsavedEdits(delegate() { askForUnsavedEdits(delegate() {
if (currentWorkspace) { if (currentWorkspace) {
// Remember opened files // Remember opened files
saveListOfOpenedFiles(); saveListOfOpenedFiles();
} }
window.close(); window.close();
}); });
return false; return false;
} }
/// called when main window is closing /// called when main window is closing

158
src/dlangide/ui/newfile.d
View File

@ -40,7 +40,7 @@ class NewFileDlg : Dialog {
string[] _sourcePaths; string[] _sourcePaths;
this(IDEFrame parent, Project currentProject, ProjectFolder folder) { this(IDEFrame parent, Project currentProject, ProjectFolder folder) {
super(UIString.fromId("OPTION_NEW_SOURCE_FILE"c), parent.window, super(UIString.fromId("OPTION_NEW_SOURCE_FILE"c), parent.window,
DialogFlag.Modal | DialogFlag.Resizable | DialogFlag.Popup, 500, 400); DialogFlag.Modal | DialogFlag.Resizable | DialogFlag.Popup, 500, 400);
_ide = parent; _ide = parent;
_icon = "dlangui-logo1"; _icon = "dlangui-logo1";
this._project = currentProject; this._project = currentProject;
@ -60,34 +60,34 @@ class NewFileDlg : Dialog {
try { try {
content = parseML(q{ content = parseML(q{
VerticalLayout { VerticalLayout {
id: vlayout id: vlayout
padding: Rect { 5, 5, 5, 5 } padding: Rect { 5, 5, 5, 5 }
layoutWidth: fill; layoutHeight: fill layoutWidth: fill; layoutHeight: fill
HorizontalLayout { HorizontalLayout {
layoutWidth: fill; layoutHeight: fill layoutWidth: fill; layoutHeight: fill
VerticalLayout { VerticalLayout {
margins: 5 margins: 5
layoutWidth: 50%; layoutHeight: fill layoutWidth: 50%; layoutHeight: fill
TextWidget { text: OPTION_PROJECT_TEMPLATE } TextWidget { text: OPTION_PROJECT_TEMPLATE }
StringListWidget { StringListWidget {
id: projectTemplateList id: projectTemplateList
layoutWidth: wrap; layoutHeight: fill layoutWidth: wrap; layoutHeight: fill
} }
} }
VerticalLayout { VerticalLayout {
margins: 5 margins: 5
layoutWidth: 50%; layoutHeight: fill layoutWidth: 50%; layoutHeight: fill
TextWidget { text: OPTION_TEMPLATE_DESCR } TextWidget { text: OPTION_TEMPLATE_DESCR }
EditBox { EditBox {
id: templateDescription; readOnly: true id: templateDescription; readOnly: true
layoutWidth: fill; layoutHeight: fill layoutWidth: fill; layoutHeight: fill
} }
} }
} }
TableLayout { TableLayout {
margins: 5 margins: 5
colCount: 2 colCount: 2
layoutWidth: fill; layoutHeight: wrap layoutWidth: fill; layoutHeight: wrap
TextWidget { text: NAME } TextWidget { text: NAME }
EditLine { id: edName; text: "newfile"; layoutWidth: fill } EditLine { id: edName; text: "newfile"; layoutWidth: fill }
TextWidget { text: LOCATION } TextWidget { text: LOCATION }
@ -218,13 +218,13 @@ class NewFileDlg : Dialog {
return setError("Location directory does not exist"); return setError("Location directory does not exist");
if (_currentTemplate.kind == FileKind.MODULE || _currentTemplate.kind == FileKind.PACKAGE) { if (_currentTemplate.kind == FileKind.MODULE || _currentTemplate.kind == FileKind.PACKAGE) {
string sourcePath, relativePath; string sourcePath, relativePath;
if (!findSource(_sourcePaths, _location, sourcePath, relativePath)) if (!findSource(_sourcePaths, _location, sourcePath, relativePath))
return setError("Location is outside of source path"); return setError("Location is outside of source path");
if (!isValidModuleName(filename)) if (!isValidModuleName(filename))
return setError("Invalid file name"); return setError("Invalid file name");
_moduleName = filename; _moduleName = filename;
_packageName = getPackageName(sourcePath, relativePath); _packageName = getPackageName(sourcePath, relativePath);
string m; string m;
if (_currentTemplate.kind == FileKind.MODULE) { if (_currentTemplate.kind == FileKind.MODULE) {
m = !_packageName.empty ? _packageName ~ '.' ~ _moduleName : _moduleName; m = !_packageName.empty ? _packageName ~ '.' ~ _moduleName : _moduleName;
@ -248,9 +248,9 @@ class NewFileDlg : Dialog {
private FileCreationResult _result; private FileCreationResult _result;
bool createItem() { bool createItem() {
if(!createFile(_fullPathName, _currentTemplate.kind, _packageName, _currentTemplate.srccode)) { if(!createFile(_fullPathName, _currentTemplate.kind, _packageName, _currentTemplate.srccode)) {
return setError("Cannot create file"); return setError("Cannot create file");
} }
_result = new FileCreationResult(_project, _fullPathName); _result = new FileCreationResult(_project, _fullPathName);
return true; return true;
@ -292,22 +292,22 @@ class NewFileDlg : Dialog {
void initTemplates() { void initTemplates() {
_templates ~= new ProjectTemplate("Empty module"d, "Empty D module file."d, ".d", _templates ~= new ProjectTemplate("Empty module"d, "Empty D module file."d, ".d",
"\n", FileKind.MODULE); "\n", FileKind.MODULE);
_templates ~= new ProjectTemplate("Package"d, "D package."d, ".d", _templates ~= new ProjectTemplate("Package"d, "D package."d, ".d",
"\n", FileKind.PACKAGE); "\n", FileKind.PACKAGE);
_templates ~= new ProjectTemplate("Text file"d, "Empty text file."d, ".txt", _templates ~= new ProjectTemplate("Text file"d, "Empty text file."d, ".txt",
"\n", FileKind.TEXT); "\n", FileKind.TEXT);
_templates ~= new ProjectTemplate("JSON file"d, "Empty json file."d, ".json", _templates ~= new ProjectTemplate("JSON file"d, "Empty json file."d, ".json",
"{\n}\n", FileKind.TEXT); "{\n}\n", FileKind.TEXT);
_templates ~= new ProjectTemplate("Vibe-D Diet Template file"d, "Empty Vibe-D Diet Template."d, ".dt", _templates ~= new ProjectTemplate("Vibe-D Diet Template file"d, "Empty Vibe-D Diet Template."d, ".dt",
q{ q{
doctype html doctype html
html html
head head
title Hello, World title Hello, World
body body
h1 Hello World h1 Hello World
}, FileKind.TEXT); }, FileKind.TEXT);
} }
} }
@ -333,58 +333,58 @@ class ProjectTemplate {
} }
bool createFile(string fullPathName, FileKind fileKind, string packageName, string sourceCode) { bool createFile(string fullPathName, FileKind fileKind, string packageName, string sourceCode) {
try { try {
if (fileKind == FileKind.MODULE) { if (fileKind == FileKind.MODULE) {
string txt = "module " ~ packageName ~ ";\n\n" ~ sourceCode; string txt = "module " ~ packageName ~ ";\n\n" ~ sourceCode;
write(fullPathName, txt); write(fullPathName, txt);
} else if (fileKind == FileKind.PACKAGE) { } else if (fileKind == FileKind.PACKAGE) {
string txt = "module " ~ packageName ~ ";\n\n" ~ sourceCode; string txt = "module " ~ packageName ~ ";\n\n" ~ sourceCode;
write(fullPathName, txt); write(fullPathName, txt);
} else { } else {
write(fullPathName, sourceCode); write(fullPathName, sourceCode);
} }
return true; return true;
} }
catch(Exception e) { catch(Exception e) {
Log.e("Cannot create file", e); Log.e("Cannot create file", e);
return false; return false;
} }
} }
string getPackageName(string path, string[] sourcePaths){ string getPackageName(string path, string[] sourcePaths){
string sourcePath, relativePath; string sourcePath, relativePath;
if(!findSource(sourcePaths, path, sourcePath, relativePath)) return ""; if(!findSource(sourcePaths, path, sourcePath, relativePath)) return "";
return getPackageName(sourcePath, relativePath); return getPackageName(sourcePath, relativePath);
} }
string getPackageName(string sourcePath, string relativePath){ string getPackageName(string sourcePath, string relativePath){
char[] buf; char[] buf;
foreach(c; relativePath) { foreach(c; relativePath) {
char ch = c; char ch = c;
if (ch == '/' || ch == '\\') if (ch == '/' || ch == '\\')
ch = '.'; ch = '.';
else if (ch == '.') else if (ch == '.')
ch = '_'; ch = '_';
if (ch == '.' && (buf.length == 0 || buf[$-1] == '.')) if (ch == '.' && (buf.length == 0 || buf[$-1] == '.'))
continue; // skip duplicate . continue; // skip duplicate .
buf ~= ch; buf ~= ch;
} }
if (buf.length && buf[$-1] == '.') if (buf.length && buf[$-1] == '.')
buf.length--; buf.length--;
return buf.dup; return buf.dup;
} }
private bool findSource(string[] sourcePaths, string path, ref string sourceFolderPath, ref string relativePath) { private bool findSource(string[] sourcePaths, string path, ref string sourceFolderPath, ref string relativePath) {
foreach(dir; sourcePaths) { foreach(dir; sourcePaths) {
if (isSubdirOf(path, dir)) { if (isSubdirOf(path, dir)) {
sourceFolderPath = dir; sourceFolderPath = dir;
relativePath = path[sourceFolderPath.length .. $]; relativePath = path[sourceFolderPath.length .. $];
if (relativePath.length > 0 && (relativePath[0] == '\\' || relativePath[0] == '/')) if (relativePath.length > 0 && (relativePath[0] == '\\' || relativePath[0] == '/'))
relativePath = relativePath[1 .. $]; relativePath = relativePath[1 .. $];
return true; return true;
} }
} }
return false; return false;
} }
private bool isSubdirOf(string path, string basePath) { private bool isSubdirOf(string path, string basePath) {
if (path.equal(basePath)) if (path.equal(basePath))

288
src/dlangide/ui/newfolder.d
View File

@ -19,168 +19,168 @@ import dlangide.ui.newfile;
import dlangide.workspace.project; import dlangide.workspace.project;
class NewFolderDialog : Dialog { class NewFolderDialog : Dialog {
private { private {
IDEFrame _ide; IDEFrame _ide;
Project _project; Project _project;
ProjectFolder _folder; ProjectFolder _folder;
string _location; string _location;
} }
this(IDEFrame parent, Project currentProject, ProjectFolder folder) { this(IDEFrame parent, Project currentProject, ProjectFolder folder) {
super(UIString.fromId("OPTION_NEW_SOURCE_FILE"c), parent.window, super(UIString.fromId("OPTION_NEW_SOURCE_FILE"c), parent.window,
DialogFlag.Modal | DialogFlag.Popup, 800, 0); DialogFlag.Modal | DialogFlag.Popup, 800, 0);
layoutWidth = FILL_PARENT; layoutWidth = FILL_PARENT;
_ide = parent; _ide = parent;
_icon = "dlangui-logo1"; _icon = "dlangui-logo1";
this._project = currentProject; this._project = currentProject;
this._folder = folder; this._folder = folder;
if (folder){ if (folder){
_location = folder.filename; _location = folder.filename;
} }
else { else {
_location = currentProject.dir; _location = currentProject.dir;
} }
} }
override void initialize() { override void initialize() {
super.initialize(); super.initialize();
Widget content; Widget content;
try { try {
content = parseML(q{ content = parseML(q{
VerticalLayout { VerticalLayout {
id: vlayout id: vlayout
padding: Rect { 5, 5, 5, 5 } padding: Rect { 5, 5, 5, 5 }
layoutWidth: fill; layoutHeight: wrap layoutWidth: fill; layoutHeight: wrap
TableLayout { TableLayout {
margins: 5 margins: 5
colCount: 2 colCount: 2
layoutWidth: fill; layoutHeight: wrap layoutWidth: fill; layoutHeight: wrap
TextWidget { text: NAME } TextWidget { text: NAME }
EditLine { id: fileName; text: "newfolder"; layoutWidth: fill } EditLine { id: fileName; text: "newfolder"; layoutWidth: fill }
CheckBox { id: makePackage } CheckBox { id: makePackage }
TextWidget { text: OPTION_MAKE_PACKAGE} TextWidget { text: OPTION_MAKE_PACKAGE}
} }
TextWidget { id: statusText; text: ""; layoutWidth: fill; textColor: #FF0000 } TextWidget { id: statusText; text: ""; layoutWidth: fill; textColor: #FF0000 }
} }
}); });
} catch (Exception e) { } catch (Exception e) {
Log.e("Exceptin while parsing DML", e); Log.e("Exceptin while parsing DML", e);
throw e; throw e;
} }
_edFileName = content.childById!EditLine("fileName"); _edFileName = content.childById!EditLine("fileName");
_edMakePackage = content.childById!CheckBox("makePackage"); _edMakePackage = content.childById!CheckBox("makePackage");
_statusText = content.childById!TextWidget("statusText"); _statusText = content.childById!TextWidget("statusText");
_edFileName.enterKey.connect(&onEnterKey); _edFileName.enterKey.connect(&onEnterKey);
_edFileName.setDefaultPopupMenu(); _edFileName.setDefaultPopupMenu();
_edFileName.contentChange = delegate (EditableContent source) { _edFileName.contentChange = delegate (EditableContent source) {
updateValues(source.text); updateValues(source.text);
validate(); validate();
}; };
addChild(content); addChild(content);
addChild(createButtonsPanel([ACTION_FILE_NEW_DIRECTORY, ACTION_CANCEL], 0, 0)); addChild(createButtonsPanel([ACTION_FILE_NEW_DIRECTORY, ACTION_CANCEL], 0, 0));
updateValues(_edFileName.text); updateValues(_edFileName.text);
} }
override void onShow() { override void onShow() {
super.onShow(); super.onShow();
_edFileName.selectAll(); _edFileName.selectAll();
_edFileName.setFocus(); _edFileName.setFocus();
} }
protected bool onEnterKey(EditWidgetBase editor) { protected bool onEnterKey(EditWidgetBase editor) {
if (!validate()) if (!validate())
return false; return false;
close(_buttonActions[0]); close(_buttonActions[0]);
return true; return true;
} }
private bool validate() { private bool validate() {
if (!isValidModuleName(_fileName)) if (!isValidModuleName(_fileName))
return setError("Invalid folder name"); return setError("Invalid folder name");
return setError(null); return setError(null);
} }
private void updateValues(dstring fileName) { private void updateValues(dstring fileName) {
_fileName = toUTF8(fileName); _fileName = toUTF8(fileName);
} }
private bool setError(dstring msg) { private bool setError(dstring msg) {
_statusText.text = msg; _statusText.text = msg;
return msg.empty; return msg.empty;
} }
private { private {
EditLine _edFileName; EditLine _edFileName;
CheckBox _edMakePackage; CheckBox _edMakePackage;
TextWidget _statusText; TextWidget _statusText;
string _fileName = "newfile"; string _fileName = "newfile";
FileCreationResult _result; FileCreationResult _result;
bool shouldMakePackage() @property { bool shouldMakePackage() @property {
return _edMakePackage.checked; return _edMakePackage.checked;
} }
string fullPathName() @property { string fullPathName() @property {
return buildNormalizedPath(_location, _fileName); return buildNormalizedPath(_location, _fileName);
} }
} }
private bool createItem() { private bool createItem() {
string fullPathName = this.fullPathName; string fullPathName = this.fullPathName;
if(exists(fullPathName)) if(exists(fullPathName))
return setError("Folder already exists"); return setError("Folder already exists");
if(!makeDirectory(fullPathName)) return false; if(!makeDirectory(fullPathName)) return false;
if(shouldMakePackage) { if(shouldMakePackage) {
if(!makePackageFile(fullPathName)) { if(!makePackageFile(fullPathName)) {
return false; return false;
} }
} }
_result = new FileCreationResult(_project, fullPathName); _result = new FileCreationResult(_project, fullPathName);
return true; return true;
} }
private bool makeDirectory(string fullPathName) { private bool makeDirectory(string fullPathName) {
try { try {
mkdir(fullPathName); mkdir(fullPathName);
return true; return true;
} catch (Exception e) { } catch (Exception e) {
Log.e("Cannot create folder", e); Log.e("Cannot create folder", e);
return setError("Cannot create folder"); return setError("Cannot create folder");
} }
} }
private bool makePackageFile(string fullPathName) { private bool makePackageFile(string fullPathName) {
string packageName = getPackageName(fullPathName, _project.sourcePaths); string packageName = getPackageName(fullPathName, _project.sourcePaths);
if(packageName.empty) { if(packageName.empty) {
Log.e("Could not determing package name for ", fullPathName); Log.e("Could not determing package name for ", fullPathName);
return false; return false;
} }
if(!createFile(fullPathName.buildPath("package.d"), FileKind.PACKAGE, packageName, null)) { if(!createFile(fullPathName.buildPath("package.d"), FileKind.PACKAGE, packageName, null)) {
Log.e("Could not create package file in folder ", fullPathName); Log.e("Could not create package file in folder ", fullPathName);
return false; return false;
} }
return true; return true;
} }
override void close(const Action action) { override void close(const Action action) {
Action newaction = action.clone(); Action newaction = action.clone();
if (action.id == IDEActions.FileNewDirectory) { if (action.id == IDEActions.FileNewDirectory) {
if (!validate()) { if (!validate()) {
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_PARAMETERS"c)); window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_PARAMETERS"c));
return; return;
} }
if (!createItem()) { if (!createItem()) {
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_PARAMETERS"c)); window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_PARAMETERS"c));
return; return;
} }
newaction.objectParam = _result; newaction.objectParam = _result;
} }
super.close(newaction); super.close(newaction);
} }
} }