Skip to content

Commit b49762d

Browse files
Merge pull request #1047 from Microsoft/parentProperty
Make ISyntaxElement.parent non-optional
2 parents 1988637 + 5d06cd7 commit b49762d

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/services/syntax/scanner.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ module TypeScript.Scanner {
252252

253253
class FixedWidthTokenWithNoTrivia implements ISyntaxToken {
254254
public _primaryExpressionBrand: any; public _memberExpressionBrand: any; public _leftHandSideExpressionBrand: any; public _postfixExpressionBrand: any; public _unaryExpressionBrand: any; public _expressionBrand: any; public _typeBrand: any; public _syntaxNodeOrTokenBrand: any;
255+
public parent: ISyntaxElement;
255256

256257
constructor(private _packedData: number) {
257258
}
@@ -286,8 +287,10 @@ module TypeScript.Scanner {
286287

287288
class LargeScannerToken implements ISyntaxToken {
288289
public _primaryExpressionBrand: any; public _memberExpressionBrand: any; public _leftHandSideExpressionBrand: any; public _postfixExpressionBrand: any; public _unaryExpressionBrand: any; public _expressionBrand: any; public _typeBrand: any; public _syntaxNodeOrTokenBrand: any;
290+
public parent: ISyntaxElement;
289291

290292
private cachedText: string;
293+
291294
constructor(private _packedFullStartAndInfo: number, private _packedFullWidthAndKind: number, cachedText: string) {
292295
if (cachedText !== undefined) {
293296
this.cachedText = cachedText;

src/services/syntax/syntaxElement.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ module TypeScript {
367367

368368
export interface ISyntaxElement {
369369
kind(): SyntaxKind;
370-
parent?: ISyntaxElement;
370+
parent: ISyntaxElement;
371371
}
372372

373373
export interface ISyntaxNode extends ISyntaxNodeOrToken {

src/services/syntax/syntaxToken.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ module TypeScript.Syntax {
305305

306306
class EmptyToken implements ISyntaxToken {
307307
public _primaryExpressionBrand: any; public _memberExpressionBrand: any; public _leftHandSideExpressionBrand: any; public _postfixExpressionBrand: any; public _unaryExpressionBrand: any; public _expressionBrand: any; public _typeBrand: any; public _syntaxNodeOrTokenBrand: any;
308+
public parent: ISyntaxElement;
308309

309310
constructor(private _kind: SyntaxKind) {
310311
}
@@ -428,6 +429,7 @@ module TypeScript.Syntax {
428429
private _trailingTrivia: ISyntaxTriviaList;
429430

430431
public _primaryExpressionBrand: any; public _memberExpressionBrand: any; public _leftHandSideExpressionBrand: any; public _postfixExpressionBrand: any; public _unaryExpressionBrand: any; public _expressionBrand: any; public _typeBrand: any; public _syntaxNodeOrTokenBrand: any;
432+
public parent: ISyntaxElement;
431433

432434
constructor(fullStart: number,
433435
kind: SyntaxKind,
@@ -497,6 +499,7 @@ module TypeScript.Syntax {
497499

498500
class ConvertedKeywordToken implements ISyntaxToken {
499501
public _primaryExpressionBrand: any; public _memberExpressionBrand: any; public _leftHandSideExpressionBrand: any; public _postfixExpressionBrand: any; public _unaryExpressionBrand: any; public _expressionBrand: any; public _typeBrand: any; public _syntaxNodeOrTokenBrand: any;
502+
public parent: ISyntaxElement;
500503

501504
constructor(private underlyingToken: ISyntaxToken) {
502505
}

0 commit comments

Comments
 (0)