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

Adding a default package.d now works

This commit is contained in:
Zevenberge 2017-12-23 18:09:04 +01:00
parent 85995f9baf
commit 87d5a88a0c
2 changed files with 223 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,29 +198,6 @@ class NewFileDlg : Dialog {
ProjectTemplate _currentTemplate; ProjectTemplate _currentTemplate;
ProjectTemplate[] _templates; ProjectTemplate[] _templates;
static bool isSubdirOf(string path, string basePath) {
if (path.equal(basePath))
return true;
if (path.length > basePath.length + 1 && path.startsWith(basePath)) {
char ch = path[basePath.length];
return ch == '/' || ch == '\\';
}
return false;
}
bool findSource(string path, ref string sourceFolderPath, ref string relativePath) {
foreach(dir; _sourcePaths) {
if (isSubdirOf(path, dir)) {
sourceFolderPath = dir;
relativePath = path[sourceFolderPath.length .. $];
if (relativePath.length > 0 && (relativePath[0] == '\\' || relativePath[0] == '/'))
relativePath = relativePath[1 .. $];
return true;
}
}
return false;
}
bool setError(dstring msg) { bool setError(dstring msg) {
_statusText.text = msg; _statusText.text = msg;
return msg.empty; return msg.empty;
@ -241,26 +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(_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;
char[] buf; _packageName = getPackageName(sourcePath, relativePath);
foreach(c; relativePath) {
char ch = c;
if (ch == '/' || ch == '\\')
ch = '.';
else if (ch == '.')
ch = '_';
if (ch == '.' && (buf.length == 0 || buf[$-1] == '.'))
continue; // skip duplicate .
buf ~= ch;
}
if (buf.length && buf[$-1] == '.')
buf.length--;
_packageName = buf.dup;
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;
@ -284,20 +248,10 @@ class NewFileDlg : Dialog {
private FileCreationResult _result; private FileCreationResult _result;
bool createItem() { bool createItem() {
try { if(!createFile(_fullPathName, _currentTemplate.kind, _packageName, _currentTemplate.srccode)) {
if (_currentTemplate.kind == FileKind.MODULE) { return setError("Cannot create file");
string txt = "module " ~ _packageName ~ ";\n\n" ~ _currentTemplate.srccode; }
write(_fullPathName, txt);
} else if (_currentTemplate.kind == FileKind.PACKAGE) {
string txt = "module " ~ _packageName ~ ";\n\n" ~ _currentTemplate.srccode;
write(_fullPathName, txt);
} else {
write(_fullPathName, _currentTemplate.srccode);
}
} catch (Exception e) {
Log.e("Cannot create file", e);
return setError("Cannot create file");
}
_result = new FileCreationResult(_project, _fullPathName); _result = new FileCreationResult(_project, _fullPathName);
return true; return true;
} }
@ -377,3 +331,67 @@ class ProjectTemplate {
this.kind = kind; this.kind = kind;
} }
} }
bool createFile(string fullPathName, FileKind fileKind, string packageName, string sourceCode) {
try {
if (fileKind == FileKind.MODULE) {
string txt = "module " ~ packageName ~ ";\n\n" ~ sourceCode;
write(fullPathName, txt);
} else if (fileKind == FileKind.PACKAGE) {
string txt = "module " ~ packageName ~ ";\n\n" ~ sourceCode;
write(fullPathName, txt);
} else {
write(fullPathName, sourceCode);
}
return true;
}
catch(Exception e) {
Log.e("Cannot create file", e);
return false;
}
}
string getPackageName(string path, string[] sourcePaths){
string sourcePath, relativePath;
if(!findSource(sourcePaths, path, sourcePath, relativePath)) return "";
return getPackageName(sourcePath, relativePath);
}
string getPackageName(string sourcePath, string relativePath){
char[] buf;
foreach(c; relativePath) {
char ch = c;
if (ch == '/' || ch == '\\')
ch = '.';
else if (ch == '.')
ch = '_';
if (ch == '.' && (buf.length == 0 || buf[$-1] == '.'))
continue; // skip duplicate .
buf ~= ch;
}
if (buf.length && buf[$-1] == '.')
buf.length--;
return buf.dup;
}
private bool findSource(string[] sourcePaths, string path, ref string sourceFolderPath, ref string relativePath) {
foreach(dir; sourcePaths) {
if (isSubdirOf(path, dir)) {
sourceFolderPath = dir;
relativePath = path[sourceFolderPath.length .. $];
if (relativePath.length > 0 && (relativePath[0] == '\\' || relativePath[0] == '/'))
relativePath = relativePath[1 .. $];
return true;
}
}
return false;
}
private bool isSubdirOf(string path, string basePath) {
if (path.equal(basePath))
return true;
if (path.length > basePath.length + 1 && path.startsWith(basePath)) {
char ch = path[basePath.length];
return ch == '/' || ch == '\\';
}
return false;
}

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

@ -2,7 +2,7 @@
import std.array : empty; import std.array : empty;
import std.file : mkdir, exists; import std.file : mkdir, exists;
import std.path : buildNormalizedPath; import std.path : buildPath, buildNormalizedPath;
import std.utf : toUTF32; import std.utf : toUTF32;
import dlangui.core.logger; import dlangui.core.logger;
@ -19,144 +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.Resizable | DialogFlag.Popup, 800, 0); DialogFlag.Modal | DialogFlag.Resizable | 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: edName; text: "newfolder"; layoutWidth: fill } EditLine { id: fileName; text: "newfolder"; layoutWidth: fill }
TextWidget { text: OPTION_FILE_PATH } CheckBox { id: makePackage }
EditLine { id: edFilePath; text: ""; layoutWidth: wrap; readOnly: true } TextWidget { text: 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("edName"); _edFileName = content.childById!EditLine("fileName");
_edFilePath = content.childById!EditLine("edFilePath"); _edMakePackage = content.childById!CheckBox("makePackage");
_statusText = content.childById!TextWidget("statusText"); _statusText = content.childById!TextWidget("statusText");
_edFileName.enterKey.connect(&onEnterKey); _edFileName.enterKey.connect(&onEnterKey);
_edFilePath.enterKey.connect(&onEnterKey);
_edFileName.setDefaultPopupMenu(); _edFileName.setDefaultPopupMenu();
_edFilePath.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);
_edFilePath.text = toUTF32(fullPathName); }
}
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;
EditLine _edFilePath; CheckBox _edMakePackage;
TextWidget _statusText; TextWidget _statusText;
string _fileName = "newfile"; string _fileName = "newfile";
FileCreationResult _result; FileCreationResult _result;
string fullPathName() @property { bool shouldMakePackage() @property {
return buildNormalizedPath(_location, _fileName); return _edMakePackage.checked;
} }
} string fullPathName() @property {
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");
try {
mkdir(fullPathName);
} catch (Exception e) {
Log.e("Cannot create folder", e);
return setError("Cannot create folder");
}
_result = new FileCreationResult(_project, fullPathName);
return true;
}
override void close(const Action action) { if(!makeDirectory(fullPathName)) return false;
Action newaction = action.clone(); if(shouldMakePackage) {
if (action.id == IDEActions.FileNewDirectory) { if(!makePackageFile(fullPathName)) {
if (!validate()) { return false;
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_PARAMETERS"c)); }
return; }
} _result = new FileCreationResult(_project, fullPathName);
if (!createItem()) { return true;
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_PARAMETERS"c)); }
return;
} private bool makeDirectory(string fullPathName) {
newaction.objectParam = _result; try {
} mkdir(fullPathName);
super.close(newaction); return true;
} } catch (Exception e) {
Log.e("Cannot create folder", e);
return setError("Cannot create folder");
}
}
private bool makePackageFile(string fullPathName) {
string packageName = getPackageName(fullPathName, _project.sourcePaths);
if(packageName.empty) {
Log.e("Could not determing package name for ", fullPathName);
return false;
}
if(!createFile(fullPathName.buildPath("package.d"), FileKind.PACKAGE, packageName, null)) {
Log.e("Could not create package file in folder ", fullPathName);
return false;
}
return true;
}
override void close(const Action action) {
Action newaction = action.clone();
if (action.id == IDEActions.FileNewDirectory) {
if (!validate()) {
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_PARAMETERS"c));
return;
}
if (!createItem()) {
window.showMessageBox(UIString.fromId("ERROR"c), UIString.fromId("ERROR_INVALID_PARAMETERS"c));
return;
}
newaction.objectParam = _result;
}
super.close(newaction);
}
} }