File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -167,7 +167,6 @@ module Harness.LanguageService {
167167 }
168168 export class TypeScriptLS implements ts . LanguageServiceShimHost {
169169 private ls : ts . LanguageServiceShim = null ;
170- public newLS : ts . LanguageService ;
171170
172171 private fileNameToScript : ts . Map < ScriptInfo > = { } ;
173172
@@ -268,12 +267,8 @@ module Harness.LanguageService {
268267 * To access the non-shim (i.e. actual) language service, use the "ls.languageService" property.
269268 */
270269 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 ;
277272 }
278273
279274 /** Parse file given its source text */
Original file line number Diff line number Diff line change @@ -2210,8 +2210,11 @@ module ts {
22102210 export function createClassifier ( host : Logger ) : Classifier {
22112211 var scanner : Scanner ;
22122212 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.
22132217 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-
22152218 function getClassificationsForLine ( text : string , lexState : EndOfLineState ) : ClassificationResult {
22162219 var offset = 0 ;
22172220 var lastTokenOrCommentEnd = 0 ;
You can’t perform that action at this time.
0 commit comments