Adding a default package.d now works

src/dlangide/ui/newfile.d

@@ -198,29 +198,6 @@ class NewFileDlg : Dialog {
     ProjectTemplate _currentTemplate;
     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) {
         _statusText.text = msg;
         return msg.empty;
@@ -242,25 +219,12 @@ class NewFileDlg : Dialog {
 
         if (_currentTemplate.kind == FileKind.MODULE || _currentTemplate.kind == FileKind.PACKAGE) {
 			string sourcePath, relativePath;
-            if (!findSource(_location, sourcePath, relativePath))
+			if (!findSource(_sourcePaths, _location, sourcePath, relativePath))
 				return setError("Location is outside of source path");
 			if (!isValidModuleName(filename))
 				return setError("Invalid file name");
 			_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;
             if (_currentTemplate.kind == FileKind.MODULE) {
                 m = !_packageName.empty ? _packageName ~ '.' ~ _moduleName : _moduleName;
@@ -284,20 +248,10 @@ class NewFileDlg : Dialog {
 
     private FileCreationResult _result;
     bool createItem() {
-        try {
+		if(!createFile(_fullPathName, _currentTemplate.kind, _packageName, _currentTemplate.srccode)) {
-            if (_currentTemplate.kind == FileKind.MODULE) {
-                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);
         return true;
     }
@@ -377,3 +331,67 @@ class ProjectTemplate {
         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;
+}

src/dlangide/ui/newfolder.d

@@ -2,7 +2,7 @@
 
 import std.array : empty;
 import std.file : mkdir, exists;
-import std.path : buildNormalizedPath;
+import std.path : buildPath, buildNormalizedPath;
 import std.utf : toUTF32;
 
 import dlangui.core.logger;
@@ -57,9 +57,9 @@ class NewFolderDialog : Dialog {
 								colCount: 2
 									layoutWidth: fill; layoutHeight: wrap
 							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 }
 					}
@@ -68,15 +68,13 @@ class NewFolderDialog : Dialog {
 			Log.e("Exceptin while parsing DML", 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");
 
 		_edFileName.enterKey.connect(&onEnterKey);
-        _edFilePath.enterKey.connect(&onEnterKey);
 
 		_edFileName.setDefaultPopupMenu();
-        _edFilePath.setDefaultPopupMenu();
 
 		_edFileName.contentChange = delegate (EditableContent source) {
 			updateValues(source.text);
@@ -110,7 +108,6 @@ class NewFolderDialog : Dialog {
 
 	private void updateValues(dstring fileName) {
 		_fileName = toUTF8(fileName);
-        _edFilePath.text = toUTF32(fullPathName);
 	}
 
 	private bool setError(dstring msg) {
@@ -120,11 +117,14 @@ class NewFolderDialog : Dialog {
 
 	private {
 		EditLine _edFileName;
-        EditLine _edFilePath;
+		CheckBox _edMakePackage;
 		TextWidget _statusText;
 
 		string _fileName = "newfile";
 		FileCreationResult _result;
+		bool shouldMakePackage() @property {
+			return _edMakePackage.checked;
+		}
 		string fullPathName() @property {
 			return buildNormalizedPath(_location, _fileName);
 		}
@@ -134,13 +134,37 @@ class NewFolderDialog : Dialog {
 		string fullPathName = this.fullPathName;
 		if(exists(fullPathName))
 			return setError("Folder already exists");
+
+		if(!makeDirectory(fullPathName)) return false;
+		if(shouldMakePackage) {
+			if(!makePackageFile(fullPathName)) {
+				return false;
+			}
+		}
+		_result = new FileCreationResult(_project, fullPathName);
+		return true;
+	}
+
+	private bool makeDirectory(string fullPathName) {
 		try {
 			mkdir(fullPathName);
+			return true;
 		} catch (Exception e) {
 			Log.e("Cannot create folder", e);
 			return setError("Cannot create folder");
 		}
-        _result = new FileCreationResult(_project, fullPathName);
+	}
+
+	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;
 	}