Merge pull request #405 from Microsoft/classifier

Wire the classifier to use the new compiler implementation

Author: mhegazy

src/compiler/scanner.ts

@@ -750,9 +750,8 @@ module ts {
                         if (text.charCodeAt(pos + 1) === CharacterCodes.asterisk) {
                             pos += 2;
 
-                            var safeLength = len - 1; // For lookahead.
                             var commentClosed = false;
-                            while (pos < safeLength) {
+                            while (pos < len) {
                                 var ch = text.charCodeAt(pos);
 
                                 if (ch === CharacterCodes.asterisk && text.charCodeAt(pos + 1) === CharacterCodes.slash) {
@@ -768,7 +767,6 @@ module ts {
                             }
 
                             if (!commentClosed) {
-                                pos++;
                                 error(Diagnostics.Asterisk_Slash_expected);
                             }
 

src/compiler/types.ts

@@ -217,7 +217,9 @@ module ts {
         FirstKeyword = BreakKeyword,
         LastKeyword = StringKeyword,
         FirstFutureReservedWord = ImplementsKeyword,
-        LastFutureReservedWord = YieldKeyword
+        LastFutureReservedWord = YieldKeyword,
+        FirstPunctuation= OpenBraceToken,
+        LastPunctuation = CaretEqualsToken
     }
 
     export enum NodeFlags {

src/harness/harnessLanguageService.ts

@@ -167,7 +167,6 @@ module Harness.LanguageService {
     }
     export class TypeScriptLS implements ts.LanguageServiceShimHost {
         private ls: ts.LanguageServiceShim = null;
-        public newLS: ts.LanguageService;
 
         private fileNameToScript: ts.Map<ScriptInfo> = {};
 
@@ -268,12 +267,13 @@ module Harness.LanguageService {
          *  To access the non-shim (i.e. actual) language service, use the "ls.languageService" property.
          */
         public getLanguageService(): ts.LanguageServiceShim {
-            var ls = new TypeScript.Services.TypeScriptServicesFactory().createLanguageServiceShim(this);
-            this.ls = ls;
-            var hostAdapter = new LanguageServiceShimHostAdapter(this);
+            this.ls = new TypeScript.Services.TypeScriptServicesFactory().createLanguageServiceShim(this);
+            return this.ls;
+        }
 
-            this.newLS = ts.createLanguageService(hostAdapter, NonCachingDocumentRegistry.Instance);
-            return ls;
+        /** Return a new instance of the classifier service shim */
+        public getClassifier(): ts.ClassifierShim {
+            return new TypeScript.Services.TypeScriptServicesFactory().createClassifierShim(this);
         }
 
         /** Parse file given its source text */

src/harness/runner.ts

@@ -68,17 +68,11 @@ if (testConfigFile !== '') {
                  runners.push(new GeneratedFourslashRunner());
                 break;
             case 'unittests':
-                runners.push(new UnitTestRunner(UnittestTestType.Compiler));
+                runners.push(new UnitTestRunner());
                 break;
             case 'rwc':
                 runners.push(new RWCRunner());
                 break;
-            case 'ls':
-                runners.push(new UnitTestRunner(UnittestTestType.LanguageService));
-                break;
-            case 'services':
-                runners.push(new UnitTestRunner(UnittestTestType.Services));
-                break;
             case 'reverse':
                 reverse = true;
                 break;
@@ -96,9 +90,12 @@ if (runners.length === 0) {
         runners.push(new ProjectRunner());
     }
 
-    //// language services
+    // language services
     runners.push(new FourslashRunner());
     //runners.push(new GeneratedFourslashRunner());
+
+    // unittests
+    runners.push(new UnitTestRunner());
 }
 
 sys.newLine = '\r\n';

src/harness/unittestrunner.ts

@@ -1,31 +1,13 @@
 ///<reference path="harness.ts" />
 ///<reference path="runnerbase.ts" />
 
-enum UnittestTestType {
-    Compiler,
-    LanguageService,
-    Services,
-}
-
 class UnitTestRunner extends RunnerBase {
-    constructor(public testType?: UnittestTestType) {
+    constructor() {
         super();
     }
 
     public initializeTests() {
-        switch (this.testType) {
-            case UnittestTestType.Compiler:
-                this.tests = this.enumerateFiles('tests/cases/unittests/compiler');
-                break;
-            case UnittestTestType.LanguageService:
-                this.tests = this.enumerateFiles('tests/cases/unittests/ls');
-                break;
-            default:
-                if (this.tests.length === 0) {
-                    throw new Error('Unsupported test cases: ' + this.testType);
-                }
-                break;
-        }
+        this.tests = this.enumerateFiles('tests/cases/unittests/services');
 
         var outfile = new Harness.Compiler.WriterAggregator()
         var outerr = new Harness.Compiler.WriterAggregator();
@@ -38,7 +20,7 @@ class UnitTestRunner extends RunnerBase {
         });
         harnessCompiler.addInputFiles(toBeAdded);
         harnessCompiler.setCompilerOptions({ noResolve: true });
-        
+
         var stdout = new Harness.Compiler.EmitterIOHost();
         var emitDiagnostics = harnessCompiler.emitAll(stdout);
         var results = stdout.toArray();
@@ -59,7 +41,9 @@ class UnitTestRunner extends RunnerBase {
                 before: before,
                 after: after,
                 Harness: Harness,
-                IO: Harness.IO
+                IO: Harness.IO,
+                ts: ts,
+                TypeScript: TypeScript
                 // FourSlash: FourSlash
             };
         }