File tree Expand file tree Collapse file tree 2 files changed +6
-8
lines changed Expand file tree Collapse file tree 2 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -167,7 +167,6 @@ module Harness.LanguageService {
167
167
}
168
168
export class TypeScriptLS implements ts . LanguageServiceShimHost {
169
169
private ls : ts . LanguageServiceShim = null ;
170
- public newLS : ts . LanguageService ;
171
170
172
171
private fileNameToScript : ts . Map < ScriptInfo > = { } ;
173
172
@@ -268,12 +267,8 @@ module Harness.LanguageService {
268
267
* To access the non-shim (i.e. actual) language service, use the "ls.languageService" property.
269
268
*/
270
269
public getLanguageService ( ) : ts . LanguageServiceShim {
271
- var ls = new TypeScript . Services . TypeScriptServicesFactory ( ) . createLanguageServiceShim ( this ) ;
272
- this . ls = ls ;
273
- var hostAdapter = new LanguageServiceShimHostAdapter ( this ) ;
274
-
275
- this . newLS = ts . createLanguageService ( hostAdapter , NonCachingDocumentRegistry . Instance ) ;
276
- return ls ;
270
+ this . ls = new TypeScript . Services . TypeScriptServicesFactory ( ) . createLanguageServiceShim ( this ) ;
271
+ return this . ls ;
277
272
}
278
273
279
274
/** Parse file given its source text */
Original file line number Diff line number Diff line change @@ -2210,8 +2210,11 @@ module ts {
2210
2210
export function createClassifier ( host : Logger ) : Classifier {
2211
2211
var scanner : Scanner ;
2212
2212
var noRegexTable : boolean [ ] ;
2213
+ /// We do not have a full parser support to know when we should parse a regex or not
2214
+ /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where
2215
+ /// we have a series of divide operator. this list allows us to be more accurate by ruling out
2216
+ /// locations where a regexp cannot exist.
2213
2217
if ( ! noRegexTable ) { noRegexTable = [ ] ; noRegexTable [ SyntaxKind . Identifier ] = true ; noRegexTable [ SyntaxKind . StringLiteral ] = true ; noRegexTable [ SyntaxKind . NumericLiteral ] = true ; noRegexTable [ SyntaxKind . RegularExpressionLiteral ] = true ; noRegexTable [ SyntaxKind . ThisKeyword ] = true ; noRegexTable [ SyntaxKind . PlusPlusToken ] = true ; noRegexTable [ SyntaxKind . MinusMinusToken ] = true ; noRegexTable [ SyntaxKind . CloseParenToken ] = true ; noRegexTable [ SyntaxKind . CloseBracketToken ] = true ; noRegexTable [ SyntaxKind . CloseBraceToken ] = true ; noRegexTable [ SyntaxKind . TrueKeyword ] = true ; noRegexTable [ SyntaxKind . FalseKeyword ] = true ; }
2214
-
2215
2218
function getClassificationsForLine ( text : string , lexState : EndOfLineState ) : ClassificationResult {
2216
2219
var offset = 0 ;
2217
2220
var lastTokenOrCommentEnd = 0 ;
You can’t perform that action at this time.
0 commit comments