Merge pull request #85 from bausshf/master

Better error messages for views
DiamondMVC · Apr 15, 2018 · 771c8f4 · 771c8f4
2 parents 839b056 + 44241ff
commit 771c8f4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/init/diamondapp.d b/init/diamondapp.d
@@ -17,8 +17,10 @@ else
 
   mixin GenerateViews;
 
-  import std.array : join;
-  mixin(generateViewsResult.join(""));
+  static foreach (viewResult; generateViewsResult)
+  {
+    mixin("#line 1 \"view: " ~ viewResult.name ~ "\"\n" ~ viewResult.source);
+  }
 
   mixin GenerateGetView;
 

diff --git a/init/web.d b/init/web.d
@@ -146,9 +146,10 @@ static if (isWeb)
   {
     mixin GenerateViews;
 
-    import std.array : join;
-
-    mixin(generateViewsResult.join(""));
+    static foreach (viewResult; generateViewsResult)
+    {
+      mixin("#line 1 \"view: " ~ viewResult.name ~ "\"\n" ~ viewResult.source);
+    }
 
     mixin GenerateGetView;
   }

diff --git a/views/viewgenerator.d b/views/viewgenerator.d
@@ -15,15 +15,21 @@ static if (!isWebApi)
     import diamond.core.webconfig;
     import diamond.views.viewparser;
 
+    struct ViewResult
+    {
+      string name;
+      string source;
+    }
+
     /**
     * Generates the strings of the view classes to use with mixin.
     * Returns:
     *   An array consisting of the generated classes of the views.
     *   The first element of the array is the routable data.
     */
-    private string[] generateViews()
+    private ViewResult[] generateViews()
     {
-      string[] viewGenerations = [];
+      ViewResult[] viewGenerations = [];
 
       string routableViewsMixin = "private static __gshared string[string] _routableViews;
       @property string[string] routableViews()
@@ -40,7 +46,7 @@ static if (!isWebApi)
         auto parts = parseTemplate(viewContent);
 
         string route;
-        viewGenerations ~= parseViewParts(parts, viewName, route);
+        viewGenerations ~= ViewResult(viewName, parseViewParts(parts, viewName, route));
 
         if (route && route.length)
         {
@@ -52,7 +58,7 @@ static if (!isWebApi)
       routableViewsMixin ~= "return _routableViews;
       }";
 
-      return [routableViewsMixin] ~ viewGenerations;
+      return [ViewResult("__routes", routableViewsMixin)] ~ viewGenerations;
     }
 
     /// The result of the generated views.