Skip to content

Commit

Permalink
Post-merge fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
wcjohnson committed Oct 12, 2017
1 parent b2a20d9 commit 052ced6
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/tokenizer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions test/fixtures/core/uncategorised/554/options.lightscript.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"throws": "Numbers with a decimal must end in a number (eg; `1.0`) in LightScript. (1:12)"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"excludePlugins": ["flow", "classProperties"],
"throws": "Unexpected token, expected ( (1:10)"
"throws": "Unexpected token (1:10)"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"alternatives": {
"all": {
"excludePlugins": ["flow"]
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"plugins": ["templateInvalidEscapes"]
"alternatives": {
"all": {
"includePlugins": ["templateInvalidEscapes"]
}
}
}
2 changes: 1 addition & 1 deletion test/fixtures/flow/type-annotations/135/actual.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type A = {
...any,
...any,
};
4 changes: 2 additions & 2 deletions test/fixtures/flow/type-annotations/136/actual.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type A = {
p: {},
...{},
p: {},
...{},
};
2 changes: 1 addition & 1 deletion test/fixtures/flow/type-annotations/137/actual.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
interface A {
...any,
...any,
};
2 changes: 1 addition & 1 deletion test/fixtures/flow/type-annotations/138/actual.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class A {}
class B {}
type C = {
...A&B
...A&B
};
2 changes: 1 addition & 1 deletion test/fixtures/flow/type-annotations/139/actual.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class A {}
type C = {
-...A
-...A
};
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"all": {
"throws": "Unexpected token (3:3)"
},
"whiteblockOnly": {
"throws": "Unexpected token (3:3)"
},
"braceblock": {
"throws": "Unexpected token (3:3)"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
}
Expand Down

0 comments on commit 052ced6

Please sign in to comment.