Skip to content

Commit 8786d30

Browse files
DanielRosenwasserDanielRosenwasser
committed
Changed Debug.assert's first parameter to a boolean.
1 parent 4aafe1d commit 8786d30

6 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎src/compiler/checker.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ module ts {
424424
if (result.flags & SymbolFlags.BlockScopedVariable) {
425425
// Block-scoped variables cannot be used before their definition
426426
var declaration = forEach(result.declarations, d => d.flags & NodeFlags.BlockScoped ? d : undefined);
427-
Debug.assert(declaration, "Block-scoped variable declaration is undefined");
427+
Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
428428
var declarationSourceFile = getSourceFileOfNode(declaration);
429429
var referenceSourceFile = getSourceFileOfNode(errorLocation);
430430
if (declarationSourceFile === referenceSourceFile) {
@@ -469,7 +469,7 @@ module ts {
469469
function getSymbolOfPartOfRightHandSideOfImport(entityName: EntityName, importDeclaration?: ImportDeclaration): Symbol {
470470
if (!importDeclaration) {
471471
importDeclaration = getAncestor(entityName, SyntaxKind.ImportDeclaration);
472-
Debug.assert(importDeclaration);
472+
Debug.assert(importDeclaration !== undefined);
473473
}
474474
// There are three things we might try to look for. In the following examples,
475475
// the search term is enclosed in |...|:
@@ -3345,7 +3345,7 @@ module ts {
33453345
chainedMessage = chainedMessage || Diagnostics.Type_0_is_not_assignable_to_type_1_Colon;
33463346
terminalMessage = terminalMessage || Diagnostics.Type_0_is_not_assignable_to_type_1;
33473347
var diagnosticKey = errorInfo ? chainedMessage : terminalMessage;
3348-
Debug.assert(diagnosticKey);
3348+
Debug.assert(diagnosticKey !== undefined);
33493349
reportError(diagnosticKey, typeToString(source), typeToString(target));
33503350
}
33513351
return false;
@@ -7342,17 +7342,17 @@ module ts {
73427342
errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor;
73437343
}
73447344
else {
7345-
Debug.assert(derived.flags & SymbolFlags.Property);
7345+
Debug.assert((derived.flags & SymbolFlags.Property) !== 0);
73467346
errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property;
73477347
}
73487348
}
73497349
else if (base.flags & SymbolFlags.Property) {
7350-
Debug.assert(derived.flags & SymbolFlags.Method);
7350+
Debug.assert((derived.flags & SymbolFlags.Method) !== 0);
73517351
errorMessage = Diagnostics.Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function;
73527352
}
73537353
else {
7354-
Debug.assert(base.flags & SymbolFlags.Accessor);
7355-
Debug.assert(derived.flags & SymbolFlags.Method);
7354+
Debug.assert((base.flags & SymbolFlags.Accessor) !== 0);
7355+
Debug.assert((derived.flags & SymbolFlags.Method) !== 0);
73567356
errorMessage = Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;
73577357
}
73587358

‎src/compiler/core.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ module ts {
631631
return currentAssertionLevel >= level;
632632
}
633633

634-
export function assert(expression: any, message?: string, verboseDebugInfo?: () => string): void {
634+
export function assert(expression: boolean, message?: string, verboseDebugInfo?: () => string): void {
635635
if (!expression) {
636636
var verboseDebugString = "";
637637
if (verboseDebugInfo) {

‎src/services/formatting/smartIndenter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ module ts.formatting {
175175
function childStartsOnTheSameLineWithElseInIfStatement(parent: Node, child: Node, childStartLine: number, sourceFile: SourceFile): boolean {
176176
if (parent.kind === SyntaxKind.IfStatement && (<IfStatement>parent).elseStatement === child) {
177177
var elseKeyword = findChildOfKind(parent, SyntaxKind.ElseKeyword, sourceFile);
178-
Debug.assert(elseKeyword);
178+
Debug.assert(elseKeyword !== undefined);
179179

180180
var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
181181
return elseKeywordStartLine === childStartLine;

‎src/services/services.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,7 +1656,7 @@ module ts {
16561656
}
16571657

16581658
if (syntaxTree !== null) {
1659-
Debug.assert(sourceFile);
1659+
Debug.assert(sourceFile !== undefined);
16601660
// All done, ensure state is up to date
16611661
this.currentFileVersion = version;
16621662
this.currentFilename = filename;
@@ -1864,9 +1864,9 @@ module ts {
18641864
): SourceFile {
18651865

18661866
var bucket = getBucketForCompilationSettings(compilationSettings, /*createIfMissing*/ false);
1867-
Debug.assert(bucket);
1867+
Debug.assert(bucket !== undefined);
18681868
var entry = lookUp(bucket, filename);
1869-
Debug.assert(entry);
1869+
Debug.assert(entry !== undefined);
18701870

18711871
if (entry.sourceFile.isOpen === isOpen && entry.sourceFile.version === version) {
18721872
return entry.sourceFile;
@@ -1878,7 +1878,7 @@ module ts {
18781878

18791879
function releaseDocument(filename: string, compilationSettings: CompilerOptions): void {
18801880
var bucket = getBucketForCompilationSettings(compilationSettings, false);
1881-
Debug.assert(bucket);
1881+
Debug.assert(bucket !== undefined);
18821882

18831883
var entry = lookUp(bucket, filename);
18841884
entry.refCount--;
@@ -2549,7 +2549,7 @@ module ts {
25492549
mappedNode = precedingToken;
25502550
}
25512551

2552-
Debug.assert(mappedNode, "Could not map a Fidelity node to an AST node");
2552+
Debug.assert(mappedNode !== undefined, "Could not map a Fidelity node to an AST node");
25532553

25542554
// Get the completions
25552555
activeCompletionSession = {
@@ -2603,7 +2603,7 @@ module ts {
26032603
if (containingObjectLiteral) {
26042604
var objectLiteral = <ObjectLiteral>(mappedNode.kind === SyntaxKind.ObjectLiteral ? mappedNode : getAncestor(mappedNode, SyntaxKind.ObjectLiteral));
26052605

2606-
Debug.assert(objectLiteral);
2606+
Debug.assert(objectLiteral !== undefined);
26072607

26082608
isMemberCompletion = true;
26092609

@@ -2656,7 +2656,7 @@ module ts {
26562656
var symbol = lookUp(activeCompletionSession.symbols, entryName);
26572657
if (symbol) {
26582658
var type = session.typeChecker.getTypeOfSymbol(symbol);
2659-
Debug.assert(type, "Could not find type for symbol");
2659+
Debug.assert(type !== undefined, "Could not find type for symbol");
26602660
var completionEntry = createCompletionEntry(symbol, session.typeChecker);
26612661
// TODO(drosen): Right now we just permit *all* semantic meanings when calling 'getSymbolKind'
26622662
// which is permissible given that it is backwards compatible; but really we should consider
@@ -2755,7 +2755,7 @@ module ts {
27552755
}
27562756
if (rootSymbolFlags & SymbolFlags.GetAccessor) return ScriptElementKind.memberVariableElement;
27572757
if (rootSymbolFlags & SymbolFlags.SetAccessor) return ScriptElementKind.memberVariableElement;
2758-
Debug.assert(rootSymbolFlags & SymbolFlags.Method);
2758+
Debug.assert((rootSymbolFlags & SymbolFlags.Method) !== undefined);
27592759
}) || ScriptElementKind.memberFunctionElement;
27602760
}
27612761
return ScriptElementKind.memberVariableElement;
@@ -5155,7 +5155,7 @@ module ts {
51555155
descriptor = descriptors[i];
51565156
}
51575157
}
5158-
Debug.assert(descriptor);
5158+
Debug.assert(descriptor !== undefined);
51595159

51605160
// We don't want to match something like 'TODOBY', so we make sure a non
51615161
// letter/digit follows the match.

‎src/services/signatureHelp.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ module ts.SignatureHelp {
219219
// Find the list that starts right *after* the < or ( token.
220220
// If the user has just opened a list, consider this item 0.
221221
var list = getChildListThatStartsWithOpenerToken(parent, node, sourceFile);
222-
Debug.assert(list);
222+
Debug.assert(list !== undefined);
223223
return {
224224
list: list,
225225
listItemIndex: 0

‎src/services/utilities.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module ts {
3535
// syntaxList should not be undefined here. If it is, there is a problem. Find out if
3636
// there at least is a child that is a list.
3737
if (!syntaxList) {
38-
Debug.assert(findChildOfKind(node.parent, SyntaxKind.SyntaxList),
38+
Debug.assert(findChildOfKind(node.parent, SyntaxKind.SyntaxList) !== undefined,
3939
"Node of kind " + SyntaxKind[node.parent.kind] + " has no list children");
4040
}
4141

@@ -194,7 +194,7 @@ module ts {
194194
}
195195
}
196196

197-
Debug.assert(startNode || n.kind === SyntaxKind.SourceFile);
197+
Debug.assert(startNode !== undefined || n.kind === SyntaxKind.SourceFile);
198198

199199
// Here we know that none of child token nodes embrace the position,
200200
// the only known case is when position is at the end of the file.

0 commit comments

Comments
 (0)