Skip to content

Commit dd6a129

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/TypeScript into esSymbols
2 parents 59dc7d3 + cbeea38 commit dd6a129

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/services/services.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5680,7 +5680,7 @@ module ts {
56805680
keyword2 === SyntaxKind.ConstructorKeyword ||
56815681
keyword2 === SyntaxKind.StaticKeyword) {
56825682

5683-
// Allow things like "public get", "public constructor" and "public static".
5683+
// Allow things like "public get", "public constructor" and "public static".
56845684
// These are all legal.
56855685
return true;
56865686
}
@@ -5697,7 +5697,7 @@ module ts {
56975697

56985698
// If there is a syntactic classifier ('syntacticClassifierAbsent' is false),
56995699
// we will be more conservative in order to avoid conflicting with the syntactic classifier.
5700-
function getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent?: boolean): ClassificationResult {
5700+
function getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean): ClassificationResult {
57015701
var offset = 0;
57025702
var token = SyntaxKind.Unknown;
57035703
var lastNonTriviaToken = SyntaxKind.Unknown;

0 commit comments

Comments
 (0)