Browse Source

Changes to work with TS 2.0 in the intellisense and compiler. Also turned on case sensitive "import" calls.

Shaddock Heath 9 years ago
parent
commit
9238191d31

+ 1 - 1
Build/Scripts/BuildCommon.js

@@ -179,7 +179,7 @@ namespace('build', function() {
 
 
                     // copy lib.core.d.ts into the tool data directory
                     // copy lib.core.d.ts into the tool data directory
                     fs.mkdirsSync("./Artifacts/Build/Resources/EditorData/AtomicEditor/EditorScripts/AtomicEditor/TypeScriptSupport");
                     fs.mkdirsSync("./Artifacts/Build/Resources/EditorData/AtomicEditor/EditorScripts/AtomicEditor/TypeScriptSupport");
-                    fs.copySync("./Build/node_modules/typescript/lib/lib.core.d.ts","./Data/AtomicEditor/TypeScriptSupport/lib.core.d.ts")
+                    fs.copySync("./Build/node_modules/typescript/lib/lib.es5.d.ts","./Data/AtomicEditor/TypeScriptSupport/lib.es5.d.ts");
 
 
                     // copy the combined Atomic.d.ts to the tool data directory
                     // copy the combined Atomic.d.ts to the tool data directory
                     fs.copySync("./Script/TypeScript/dist/Atomic.d.ts","./Data/AtomicEditor/TypeScriptSupport/Atomic.d.ts")
                     fs.copySync("./Script/TypeScript/dist/Atomic.d.ts","./Data/AtomicEditor/TypeScriptSupport/Atomic.d.ts")

+ 1 - 0
Data/AtomicEditor/TypeScriptSupport/.gitignore

@@ -1,2 +1,3 @@
 lib.core.d.ts
 lib.core.d.ts
+lib.es5.d.ts
 Atomic.d.ts
 Atomic.d.ts

+ 14 - 1
Script/AtomicWebViewEditor/clientExtensions/languageExtensions/typescript/workerprocess/TypescriptLanguageService.ts

@@ -111,7 +111,20 @@ export class TypescriptLanguageService {
      * @return {[type]}
      * @return {[type]}
      */
      */
     setTsConfig(tsConfig: any) {
     setTsConfig(tsConfig: any) {
-        let cmdLine = ts.parseJsonConfigFileContent(tsConfig, undefined, undefined);
+        // Need to pass a stub in.  It's not going to be used, but the JSON Config Parser needs an object in order to parse the tsconfig
+        const stubParseConfigHost: ts.ParseConfigHost = {
+            readDirectory(rootDir: string, extension: string, exclude: string[] ): string[] {
+                return null;
+            },
+            fileExists(fileName: string): boolean {
+                return false;
+            },
+            readFile(fileName: string): string {
+                return "";
+            }
+        };
+
+        let cmdLine = ts.parseJsonConfigFileContent(tsConfig, stubParseConfigHost, ".");
         this.compilerOptions = cmdLine.options;
         this.compilerOptions = cmdLine.options;
 
 
         // Set a dummy out directory because we need to be able to handle JS files
         // Set a dummy out directory because we need to be able to handle JS files

+ 2 - 1
Script/AtomicWebViewEditor/tsconfig.json

@@ -7,7 +7,8 @@
         "removeComments": true,
         "removeComments": true,
         "noLib": false,
         "noLib": false,
         "outDir": "../../Data/AtomicEditor/CodeEditor/source/editorCore",
         "outDir": "../../Data/AtomicEditor/CodeEditor/source/editorCore",
-        "sourceMap": true
+        "sourceMap": true,
+        "forceConsistentCasingInFileNames": true
     },
     },
     "filesGlob": [
     "filesGlob": [
         "./**/*.ts",
         "./**/*.ts",

+ 2 - 1
Script/tsconfig.json

@@ -9,7 +9,8 @@
         "outDir": "../Artifacts/Build/Resources/EditorData/AtomicEditor/EditorScripts",
         "outDir": "../Artifacts/Build/Resources/EditorData/AtomicEditor/EditorScripts",
         "moduleResolution": "classic",
         "moduleResolution": "classic",
         "sourceMap": true,
         "sourceMap": true,
-        "experimentalDecorators": true
+        "experimentalDecorators": true,
+        "forceConsistentCasingInFileNames": true
     },
     },
     "filesGlob": [
     "filesGlob": [
         "./ToolCore/**/*.ts",
         "./ToolCore/**/*.ts",