Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions internal/parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ type ParserState struct {
scannerState scanner.ScannerState
contextFlags ast.NodeFlags
diagnosticsLen int
jsDiagnosticsLen int
statementHasAwaitIdentifier bool
hasParseError bool
}
Expand All @@ -270,6 +271,7 @@ func (p *Parser) mark() ParserState {
scannerState: p.scanner.Mark(),
contextFlags: p.contextFlags,
diagnosticsLen: len(p.diagnostics),
jsDiagnosticsLen: len(p.jsDiagnostics),
statementHasAwaitIdentifier: p.statementHasAwaitIdentifier,
hasParseError: p.hasParseError,
}
Expand All @@ -280,6 +282,7 @@ func (p *Parser) rewind(state ParserState) {
p.token = p.scanner.Token()
p.contextFlags = state.contextFlags
p.diagnostics = p.diagnostics[0:state.diagnosticsLen]
p.jsDiagnostics = p.jsDiagnostics[0:state.jsDiagnosticsLen]
p.statementHasAwaitIdentifier = state.statementHasAwaitIdentifier
p.hasParseError = state.hasParseError
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//// [tests/cases/compiler/jsSpeculativeParsingError.ts] ////

=== t.js ===
const is_morning = new Date().getHours() < 12;
>is_morning : Symbol(is_morning, Decl(t.js, 0, 5))
>new Date().getHours : Symbol(Date.getHours, Decl(lib.es5.d.ts, --, --))
>Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --))
>getHours : Symbol(Date.getHours, Decl(lib.es5.d.ts, --, --))

// prettier-ignore
const greeting = ([
>greeting : Symbol(greeting, Decl(t.js, 3, 5))

is_morning ? 'good morning' : 'good evening'
>is_morning : Symbol(is_morning, Decl(t.js, 0, 5))

]);

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//// [tests/cases/compiler/jsSpeculativeParsingError.ts] ////

=== t.js ===
const is_morning = new Date().getHours() < 12;
>is_morning : boolean
>new Date().getHours() < 12 : boolean
>new Date().getHours() : number
>new Date().getHours : () => number
>new Date() : Date
>Date : DateConstructor
>getHours : () => number
>12 : 12

// prettier-ignore
const greeting = ([
>greeting : string[]
>([ is_morning ? 'good morning' : 'good evening']) : string[]
>[ is_morning ? 'good morning' : 'good evening'] : string[]

is_morning ? 'good morning' : 'good evening'
>is_morning ? 'good morning' : 'good evening' : "good evening" | "good morning"
>is_morning : boolean
>'good morning' : "good morning"
>'good evening' : "good evening"

]);

12 changes: 12 additions & 0 deletions testdata/tests/cases/compiler/jsSpeculativeParsingError.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// @strict: true
// @allowJs: true
// @checkJs: true
// @noEmit: true
// @filename: t.js

const is_morning = new Date().getHours() < 12;

// prettier-ignore
const greeting = ([
is_morning ? 'good morning' : 'good evening'
]);
Loading