Post-merge fixup

wcjohnson · Oct 12, 2017 · 052ced6 · 052ced6
1 parent b2a20d9
commit 052ced6
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 21 deletions.
diff --git a/src/tokenizer/index.js b/src/tokenizer/index.js
@@ -725,7 +725,7 @@ export default class Tokenizer {
     if (octal && this.state.pos == start + 1) octal = false; // number === 0
 
     let next = this.input.charCodeAt(this.state.pos);
-    if (next === 46 && !octal) { // '.'
+    if (next === 46 && !octal && !noFloatsAllowed) { // '.'
       ++this.state.pos;
       this.readInt(10);
       isFloat = true;

diff --git a/test/fixtures/core/uncategorised/554/options.lightscript.json b/test/fixtures/core/uncategorised/554/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Numbers with a decimal must end in a number (eg; `1.0`) in LightScript. (1:12)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0268/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0268/options.json
@@ -1,4 +1,4 @@
 {
   "excludePlugins": ["flow", "classProperties"],
-  "throws": "Unexpected token, expected ( (1:10)"
+  "throws": "Unexpected token (1:10)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0268/options.lightscript.json b/test/fixtures/esprima/invalid-syntax/migrated_0268/options.lightscript.json
diff --git a/test/fixtures/experimental/export-extensions/default-type-without-flow/options.json b/test/fixtures/experimental/export-extensions/default-type-without-flow/options.json
@@ -0,0 +1,7 @@
+{
+  "alternatives": {
+    "all": {
+      "excludePlugins": ["flow"]
+    }
+  }
+}
diff --git a/test/fixtures/experimental/template-literal-invalid-escapes-tagged/options.json b/test/fixtures/experimental/template-literal-invalid-escapes-tagged/options.json
@@ -1,3 +1,7 @@
 {
-  "plugins": ["templateInvalidEscapes"]
+  "alternatives": {
+    "all": {
+      "includePlugins": ["templateInvalidEscapes"]
+    }
+  }
 }
diff --git a/test/fixtures/flow/type-annotations/135/actual.js b/test/fixtures/flow/type-annotations/135/actual.js
@@ -1,3 +1,3 @@
 type A = {
-	...any,
+ ...any,
 };
diff --git a/test/fixtures/flow/type-annotations/136/actual.js b/test/fixtures/flow/type-annotations/136/actual.js
@@ -1,4 +1,4 @@
 type A = {
-	p: {},
-	...{},
+ p: {},
+ ...{},
 };
diff --git a/test/fixtures/flow/type-annotations/137/actual.js b/test/fixtures/flow/type-annotations/137/actual.js
@@ -1,3 +1,3 @@
 interface A {
-	...any,
+ ...any,
 };
diff --git a/test/fixtures/flow/type-annotations/138/actual.js b/test/fixtures/flow/type-annotations/138/actual.js
@@ -1,5 +1,5 @@
 class A {}
 class B {}
 type C = {
-	...A&B
+ ...A&B
 };
diff --git a/test/fixtures/flow/type-annotations/139/actual.js b/test/fixtures/flow/type-annotations/139/actual.js
@@ -1,4 +1,4 @@
 class A {}
 type C = {
-  -...A
+ -...A
 };
diff --git a/.../fixtures/lightscript/object-block-ambiguity/error-block-starts-with-pattern/options.json b/.../fixtures/lightscript/object-block-ambiguity/error-block-starts-with-pattern/options.json
@@ -3,9 +3,6 @@
     "all": {
       "throws": "Unexpected token (3:3)"
     },
-    "whiteblockOnly": {
-      "throws": "Unexpected token (3:3)"
-    },
     "braceblock": {
       "throws": "Unexpected token (3:3)"
     }

diff --git a/test/fixtures/lightscript/object-block-ambiguity/error-obj/options.json b/test/fixtures/lightscript/object-block-ambiguity/error-obj/options.json
@@ -3,9 +3,6 @@
     "all": {
       "throws": "Expected an Indent or Statement (7:6)"
     },
-    "whiteblockOnly": {
-      "throws": "Expected an Indent or Statement (7:6)"
-    },
     "braceblock": {
       "throws": "Leading decorators must be attached to a class declaration (7:2)"
     }

diff --git a/test/fixtures/lightscript/object-block-ambiguity/pattern-block/options.json b/test/fixtures/lightscript/object-block-ambiguity/pattern-block/options.json
@@ -3,9 +3,6 @@
     "all": {
       "throws": "Cannot parse brace-delimited construct as an object or as a block. When parsed as an object, the error is: Unexpected token, expected , (3:3)"
     },
-    "whiteblockOnly": {
-      "throws": "Unexpected token, expected , (3:3)"
-    },
     "braceblock": {
       "throws": "Unexpected token, expected , (3:3)"
     }