From 5876c474fa0c1d8af2c02c6af5b1d6ac56c4dd90 Mon Sep 17 00:00:00 2001 From: ackeardoct Date: Thu, 17 Nov 2016 21:06:01 +0300 Subject: [PATCH 1/4] Settings DCD path from workspace settings file --- README.md | 19 +++++++++++++++++++ src/dlangide/workspace/project.d | 11 +++++++++++ src/dlangide/workspace/workspace.d | 5 +++++ 3 files changed, 35 insertions(+) diff --git a/README.md b/README.md index deacb06..848d129 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,24 @@ [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/buggins/dlangide?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/buggins/dlangide.svg?branch=master)](https://travis-ci.org/buggins/dlangide) [![PayPayl donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=H2ADZV8S6TDHQ "Donate once-off to this project using Paypal") +WTF?! (What The Fork) +====================== +Now you can set dmd includes paths (for correct work with DCD) in workspace settings file (newworkspace.dlangidews) + +example: +{ + "name": "newworkspace", + "description": null, + "projects": { + "newproject": "newproject/dub.json" + }, + "includePath": [ + "/usr/include/dlang/dmd/" + ] +} + +PS. + Sorry about bad code. Please correct me. + Dlang IDE ========= diff --git a/src/dlangide/workspace/project.d b/src/dlangide/workspace/project.d index cf6a273..77b702d 100644 --- a/src/dlangide/workspace/project.d +++ b/src/dlangide/workspace/project.d @@ -12,6 +12,8 @@ import std.path; import std.process; import std.utf; +string[] includePath; + /// return true if filename matches rules for workspace file names bool isProjectFile(in string filename) pure nothrow { return filename.baseName.equal("dub.json") || filename.baseName.equal("DUB.JSON") || filename.baseName.equal("package.json") || @@ -284,6 +286,11 @@ class WorkspaceItem { /// detect DMD source paths string[] dmdSourcePaths() { string[] res; + + if(!includePath.empty){ + res ~= includePath; + } + version(Windows) { import dlangui.core.files; string dmdPath = findExecutablePath("dmd"); @@ -371,6 +378,10 @@ class Project : WorkspaceItem { this(Workspace ws, string fname = null, string dependencyVersion = null) { super(fname); _workspace = ws; + + foreach(obj; _workspace.includePath.array) + includePath ~= obj.str; + _items = new ProjectFolder(fname); _dependencyVersion = dependencyVersion; _isDependency = _dependencyVersion.length > 0; diff --git a/src/dlangide/workspace/workspace.d b/src/dlangide/workspace/workspace.d index 66d4861..c01b0fa 100644 --- a/src/dlangide/workspace/workspace.d +++ b/src/dlangide/workspace/workspace.d @@ -75,6 +75,11 @@ class Workspace : WorkspaceItem { return null; } + @property Setting includePath(){ + Setting res = _workspaceFile.objectByPath("includePath", true); + return res; + } + @property Project[] projects() { return _projects; } @property BuildConfiguration buildConfiguration() { return _buildConfiguration; } From f4e9934f6fcf5a40f6394c51b5c36ea0e47240cf Mon Sep 17 00:00:00 2001 From: AckeardOct Date: Thu, 17 Nov 2016 21:12:08 +0300 Subject: [PATCH 2/4] Update README.md --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 848d129..a74fd32 100644 --- a/README.md +++ b/README.md @@ -3,21 +3,21 @@ WTF?! (What The Fork) ====================== Now you can set dmd includes paths (for correct work with DCD) in workspace settings file (newworkspace.dlangidews) - +
 example:
 {
-	"name": "newworkspace",
-    "description": null,
-    "projects": {
-        "newproject": "newproject/dub.json"
-    },
-    "includePath": [
-        "/usr/include/dlang/dmd/"
-    ]
+        "name" : "newworkspace",
+        "description" : null,
+        "projects" : {
+                "newproject" : "newproject/dub.json"

+        },
+        "includePath" : [
+                "/usr/include/dlang/dmd/"
+        ]
 }
-
+
PS. - Sorry about bad code. Please correct me. + Sorry about bad code. Please correct me. Dlang IDE ========= From 6ea4ce9f5a43eb017bde6ae904edd82aed9efa8a Mon Sep 17 00:00:00 2001 From: drug007 Date: Thu, 2 Mar 2017 17:33:46 +0300 Subject: [PATCH 3/4] Fix #187. --- src/dlangide/ui/frame.d | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d index b316b84..cdfb1b8 100644 --- a/src/dlangide/ui/frame.d +++ b/src/dlangide/ui/frame.d @@ -981,8 +981,10 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL dlg.show(); return true; case IDEActions.GoToDefinition: - Log.d("Trying to go to definition."); - currentEditor.editorTool.goToDefinition(currentEditor(), currentEditor.caretPos); + if (currentEditor) { + Log.d("Trying to go to definition."); + currentEditor.editorTool.goToDefinition(currentEditor(), currentEditor.caretPos); + } return true; case IDEActions.GetDocComments: Log.d("Trying to get doc comments."); From 00e17a8d3b4b40a38358a81537f2d26441462993 Mon Sep 17 00:00:00 2001 From: drug007 Date: Thu, 2 Mar 2017 17:50:38 +0300 Subject: [PATCH 4/4] Prevent crashing if we create the project while current workspace is null. --- src/dlangide/workspace/project.d | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dlangide/workspace/project.d b/src/dlangide/workspace/project.d index 77b702d..bb2fd47 100644 --- a/src/dlangide/workspace/project.d +++ b/src/dlangide/workspace/project.d @@ -379,8 +379,10 @@ class Project : WorkspaceItem { super(fname); _workspace = ws; - foreach(obj; _workspace.includePath.array) - includePath ~= obj.str; + if (_workspace) { + foreach(obj; _workspace.includePath.array) + includePath ~= obj.str; + } _items = new ProjectFolder(fname); _dependencyVersion = dependencyVersion;