Merge pull request #2 from fachammer/bugfix/platform-conforming-line-…

…endings

Fix for windows issues

README.md

@@ -125,7 +125,7 @@ Options:
   -V, --version            output the version number
   -s, --scope <scope>      Language scope, e.g. source.dhall
   -g, --grammar <grammar>  Path to a grammar file, either .json or .xml
-  -t, --testcases <glob>   A glob pattern which specifies testcases to run, e.g. './tests/**/test*.dhall'. Quotes are important!
+  -t, --testcases <glob>   A glob pattern which specifies testcases to run, e.g. "./tests/**/test*.dhall". Quotes are important!
   -c, --compact            Display output in the compact format, which is easier to use with VSCode problem matchers
   -h, --help               output usage information
 ```
@@ -140,7 +140,7 @@ Options:
   -V, --version            output the version number
   -s, --scope <scope>      Language scope, e.g. source.dhall
   -g, --grammar <grammar>  Path to a grammar file, either .json or .xml
-  -t, --testcases <glob>   A glob pattern which specifies testcases to run, e.g. './tests/**/test*.dhall'. Quotes are important!
+  -t, --testcases <glob>   A glob pattern which specifies testcases to run, e.g. "./tests/**/test*.dhall". Quotes are important!
   -u, --updateSnapshot     overwrite all snap files with new changes
   --printNotModified       include not modified scopes in the output
   --expandDiff             produce each diff on two lines prefixed with "++" and "--"
@@ -150,7 +150,7 @@ Options:
 Example:
 
 ```bash
-> vscode-tmgrammar-test -s source.dhall -g testcase/dhall.tmLanguage.json -t '**/*.dhall'
+> vscode-tmgrammar-test -s source.dhall -g testcase/dhall.tmLanguage.json -t "**/*.dhall"
 ```
 
 ### Setup VSCode unit test task
@@ -161,7 +161,7 @@ You can setup a vscode unit test task for convenience:
 {
             "label": "Run tests",
             "type": "shell",
-            "command": "vscode-tmgrammar-test -c -s source.dhall -g testcase/dhall.tmLanguage.json -t '**/*.dhall'",
+            "command": "vscode-tmgrammar-test -c -s source.dhall -g testcase/dhall.tmLanguage.json -t \"**/*.dhall\"",
             "group": "test",
             "presentation": {
                 "reveal": "always",

src/snapshot.ts

@@ -26,7 +26,7 @@ program
     .description("Run VSCode textmate grammar snapshot tests")
     .option('-s, --scope <scope>', 'Language scope, e.g. source.dhall')
     .option('-g, --grammar <grammar>', 'Path to a grammar file, either .json or .xml')
-    .option('-t, --testcases <glob>', 'A glob pattern which specifies testcases to run, e.g. \'./tests/**/test*.dhall\'. Quotes are important!')
+    .option('-t, --testcases <glob>', 'A glob pattern which specifies testcases to run, e.g. \"./tests/**/test*.dhall\". Quotes are important!')
     .option("-u, --updateSnapshot", 'overwrite all snap files with new changes')
     .option("--printNotModified", 'include not modified scopes in the output', false)
     .option("--expandDiff", 'produce each diff on two lines prefixed with "++" and "--"', false)

src/snapshot/index.ts

@@ -2,6 +2,7 @@
 
 import * as tm from 'vscode-textmate';
 import { AnnotatedLine } from './model';
+import { EOL } from 'os';
 
 
 
@@ -11,7 +12,7 @@ export async function getVSCodeTokens(registry: tm.Registry, scope: string, sour
 
         let ruleStack: tm.StackElement = <any>null;
 
-        return source.split("\n").map((line: string, n: number) => {
+        return source.split(EOL).map((line: string, n: number) => {
             var {tokens, ruleStack:ruleStack1} = grammar.tokenizeLine(line, ruleStack);
             ruleStack = ruleStack1;
 

src/snapshot/parsing.ts

@@ -1,9 +1,10 @@
 
 import {AnnotatedLine, IToken} from "./model"
+import {EOL} from 'os'
 
 export function parseSnap(s:string): AnnotatedLine[] {
     let result: AnnotatedLine[] = []
-    let ls = s.split("\n")
+    let ls = s.split(EOL)
     let i = 0
     while(i < ls.length) {
         let l = ls[i];

src/unit.ts

@@ -20,7 +20,7 @@ program
   .description("Run Textmate grammar test cases using vscode-textmate")
   .option('-s, --scope <scope>', 'Language scope, e.g. source.dhall')
   .option('-g, --grammar <grammar>', 'Path to a grammar file, either .json or .xml')
-  .option('-t, --testcases <glob>', 'A glob pattern which specifies testcases to run, e.g. \'./tests/**/test*.dhall\'. Quotes are important!')
+  .option('-t, --testcases <glob>', 'A glob pattern which specifies testcases to run, e.g. \"./tests/**/test*.dhall\". Quotes are important!')
   .option('-c, --compact', 'Display output in the compact format, which is easier to use with VSCode problem matchers')
   .parse(process.argv);
 

src/unit/parsing.ts

@@ -1,5 +1,6 @@
 
 import { ScopeAssertion, TestCaseMetadata, LineAssertion, GrammarTestCase } from './model';
+import { EOL } from 'os';
 
 const leftArrowAssertRegex = /^\s*<([~]*)([-]+)((?:\s*\w[-\w.]*)*)(?:\s*-)?((?:\s*\w[-\w.]*)*)\s*$/
 const upArrowAssertRegex = /^\s*(\^+)((?:\s*\w[-\w.]*)*)(?:\s*-)?((?:\s*\w[-\w.]*)*)\s*$/
@@ -78,7 +79,7 @@ export function parseHeader(as: string[]): TestCaseMetadata {
 
 export function parseGrammarTestCase(str: string): GrammarTestCase {
     let headerLength = 1;
-    let lines = str.split("\n")
+    let lines = str.split(EOL);
     let metadata = parseHeader(lines)
     let { commentToken } = metadata
     let rest = lines.slice(headerLength)