Merge pull request #24 from marcel-hofer/feature/20-fix-include-paths

Allow '-', '.' and ' ' in include file paths
marcel-hofer · Nov 4, 2017 · 75ec68c · 75ec68c
2 parents 9d085bd + 3c538e3
commit 75ec68c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/specs/services/markdown/include-plugin-tests.ts b/specs/services/markdown/include-plugin-tests.ts
@@ -23,6 +23,10 @@ describe('IncludePlugin', function() {
 
             // Special cases
             { input: '@(include path/to/file.md)', match: true, file: 'path/to/file.md' },
+            { input: '@(include file_1.md)', match: true, file: 'file_1.md' },
+            { input: '@(include file-1.md)', match: true, file: 'file-1.md' },
+            { input: '@(include file.1.md)', match: true, file: 'file.1.md' },
+            { input: '@(include file 1.md)', match: true, file: 'file 1.md' },
 
             // Non-matching cases
             { input: '# Title', match: false, file: '' },
@@ -227,6 +231,4 @@ describe('IncludePlugin', function() {
             should.throws(act);
         });
     });
-
-
 });
diff --git a/src/services/markdown/include-plugin.ts b/src/services/markdown/include-plugin.ts
@@ -21,7 +21,7 @@ import fileService from "../file-service";
  */
 export class IncludePlugin {
     public static readonly IDENTIFIER = 'include';
-    public static readonly REGEX = /^\s*@\(include \s*([\w\/]+\.md)\s*\)\s*$/;
+    public static readonly REGEX = /^\s*@\(include \s*([\w\.\- \/]+\.md)\s*\)\s*$/;
 
     private readonly dependencyManager = new DependencyManager();