Commitae42ce3

authored

Fix wrong tokenize for lone ampersand (#158)

1 parent806a38c commitae42ce3Copy full SHA for ae42ce3

File tree

+2033

-15

lines changed

+2033

-15

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@`
`72`	`72`	`"setup":"git submodule update --init && cd test/fixtures/eslint && npm install",`
`73`	`73`	`"pretest":"run-s build lint",`
`74`	`74`	`"test":"npm run -s test:mocha",`
`75`		`-"test:mocha":"nyc mocha\"test/*.js\" --reporter dot --timeout 60000",`
	`75`	`+"test:mocha":"mocha --require ts-node/register\"test/*.js\" --reporter dot --timeout 60000",`
	`76`	`+"test:cover":"nyc mocha\"test/*.js\" --reporter dot --timeout 60000",`
`76`	`77`	`"test:debug":"mocha --require ts-node/register/transpile-only\"test/*.js\" --reporter dot --timeout 60000",`
`77`	`78`	`"preupdate-fixtures":"npm run -s build",`
`78`	`79`	`"update-fixtures":"node scripts/update-fixtures-ast.js && node scripts/update-fixtures-document-fragment.js",`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1610,14 +1610,14 @@ export class Tokenizer {`
`1610`	`1610`	`this.crStartOffset=this.offset-1`
`1611`	`1611`	`this.buffer=[AMPERSAND]`
`1612`	`1612`
`1613`		`-if(isWhitespace(cp)\|\|cp===LESS_THAN_SIGN\|\|cp===EOF){`
`1614`		`-returnthis.reconsumeAs("CHARACTER_REFERENCE_END")`
	`1613`	`+if(isDigit(cp)\|\|isLetter(cp)){`
	`1614`	`+returnthis.reconsumeAs("NAMED_CHARACTER_REFERENCE")`
`1615`	`1615`	`}`
`1616`	`1616`	`if(cp===NUMBER_SIGN){`
`1617`	`1617`	`this.buffer.push(cp)`
`1618`	`1618`	`return"NUMERIC_CHARACTER_REFERENCE"`
`1619`	`1619`	`}`
`1620`		`-returnthis.reconsumeAs("NAMED_CHARACTER_REFERENCE")`
	`1620`	`+returnthis.reconsumeAs("CHARACTER_REFERENCE_END")`
`1621`	`1621`	`}`
`1622`	`1622`
`1623`	`1623`	`/**`
`@@ -1818,7 +1818,7 @@ export class Tokenizer {`
`1818`	`1818`	`}`
`1819`	`1819`
`1820`	`1820`	`/**`
`1821`		`- * https://html.spec.whatwg.org/multipage/parsing.html#character-reference-end-state`
	`1821`	`+ * https://html.spec.whatwg.org/multipage/parsing.html#flush-code-points-consumed-as-a-character-reference`
`1822`	`1822`	`*@param cp The current code point.`
`1823`	`1823`	`*@returns The next state.`
`1824`	`1824`	`*/`

Lines changed: 21 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,13 @@ function parentMain() {`
`10`	`10`
`11`	`11`	`describe("Loading espree from ESLint",()=>{`
`12`	`12`	`it("should load espree from the ESLint location.",(done)=>{`
`13`		`-spawn(process.execPath,[__filename,"--child1"],{`
`14`		`-stdio:"inherit",`
`15`		`-})`
	`13`	`+spawn(`
	`14`	`+process.execPath,`
	`15`	`+["--require","ts-node/register",__filename,"--child1"],`
	`16`	`+{`
	`17`	`+stdio:"inherit",`
	`18`	`+},`
	`19`	`+)`
`16`	`20`	`.on("error",done)`
`17`	`21`	`.on("exit",(code)=>`
`18`	`22`	`code`
`@@ -21,9 +25,13 @@ function parentMain() {`
`21`	`25`	`)`
`22`	`26`	`})`
`23`	`27`	`it("should load espree from the ESLint location.",(done)=>{`
`24`		`-spawn(process.execPath,[__filename,"--child1"],{`
`25`		`-stdio:"inherit",`
`26`		`-})`
	`28`	`+spawn(`
	`29`	`+process.execPath,`
	`30`	`+["--require","ts-node/register",__filename,"--child1"],`
	`31`	`+{`
	`32`	`+stdio:"inherit",`
	`33`	`+},`
	`34`	`+)`
`27`	`35`	`.on("error",done)`
`28`	`36`	`.on("exit",(code)=>`
`29`	`37`	`code`
`@@ -38,9 +46,13 @@ function parentMain() {`
`38`	`46`	`execSync("npm i",{`
`39`	`47`	`stdio:"inherit",`
`40`	`48`	`})`
`41`		`-spawn(process.execPath,[__filename,"--child2"],{`
`42`		`-stdio:"inherit",`
`43`		`-})`
	`49`	`+spawn(`
	`50`	`+process.execPath,`
	`51`	`+["--require","ts-node/register",__filename,"--child2"],`
	`52`	`+{`
	`53`	`+stdio:"inherit",`
	`54`	`+},`
	`55`	`+)`
`44`	`56`	`.on("error",done)`
`45`	`57`	`.on("exit",(code)=>`
`46`	`58`	`code`

Comments

(0)