Ver código fonte

Merge pull request #1316 from acleverpun/fix/typo

Fixed all occurrences of `typscript` typo, and reverted #1309.
JoshEngebretson 9 anos atrás
pai
commit
84cba293f0

+ 1 - 1
Script/AtomicEditor/hostExtensions/ServiceLocator.ts

@@ -23,7 +23,7 @@
 import * as HostExtensionServices from "./HostExtensionServices";
 import * as HostExtensionServices from "./HostExtensionServices";
 import * as EditorUI from "../ui/EditorUI";
 import * as EditorUI from "../ui/EditorUI";
 import ProjectBasedExtensionLoader from "./coreExtensions/ProjectBasedExtensionLoader";
 import ProjectBasedExtensionLoader from "./coreExtensions/ProjectBasedExtensionLoader";
-import TypescriptLanguageExtension from "./languageExtensions/TypscriptLanguageExtension";
+import TypescriptLanguageExtension from "./languageExtensions/TypescriptLanguageExtension";
 import CSharpLanguageExtension from "./languageExtensions/CSharpLanguageExtension";
 import CSharpLanguageExtension from "./languageExtensions/CSharpLanguageExtension";
 
 
 /**
 /**

+ 1 - 1
Script/AtomicEditor/hostExtensions/coreExtensions/ProjectBasedExtensionLoader.ts

@@ -94,7 +94,7 @@ export default class ProjectBasedExtensionLoader implements Editor.HostExtension
         })(Duktape.modSearch);
         })(Duktape.modSearch);
     }
     }
     /**
     /**
-     * Called when the project is being loaded to allow the typscript language service to reset and
+     * Called when the project is being loaded to allow the typescript language service to reset and
      * possibly compile
      * possibly compile
      */
      */
     projectLoaded(ev: Editor.EditorEvents.LoadProjectEvent) {
     projectLoaded(ev: Editor.EditorEvents.LoadProjectEvent) {

+ 1 - 1
Script/AtomicEditor/hostExtensions/languageExtensions/CSharpLanguageExtension.ts

@@ -141,7 +141,7 @@ export default class CSharpLanguageExtension implements Editor.HostExtensions.Re
     /*** ProjectService implementation ****/
     /*** ProjectService implementation ****/
 
 
     /**
     /**
-    * Called when the project is being loaded to allow the typscript language service to reset and
+    * Called when the project is being loaded to allow the typescript language service to reset and
     * possibly compile
     * possibly compile
     */
     */
     projectLoaded(ev: Editor.EditorEvents.LoadProjectEvent) {
     projectLoaded(ev: Editor.EditorEvents.LoadProjectEvent) {

+ 3 - 4
Script/AtomicEditor/hostExtensions/languageExtensions/TypscriptLanguageExtension.ts → Script/AtomicEditor/hostExtensions/languageExtensions/TypescriptLanguageExtension.ts

@@ -47,7 +47,7 @@ const defaultCompilerOptions = {
  */
  */
 export default class TypescriptLanguageExtension implements Editor.HostExtensions.ResourceServicesEventListener, Editor.HostExtensions.ProjectServicesEventListener {
 export default class TypescriptLanguageExtension implements Editor.HostExtensions.ResourceServicesEventListener, Editor.HostExtensions.ProjectServicesEventListener {
     name: string = "HostTypeScriptLanguageExtension";
     name: string = "HostTypeScriptLanguageExtension";
-    description: string = "This service supports the typscript webview extension.";
+    description: string = "This service supports the typescript webview extension.";
 
 
     /**
     /**
      * Indicates if this project contains typescript files.
      * Indicates if this project contains typescript files.
@@ -285,7 +285,7 @@ export default class TypescriptLanguageExtension implements Editor.HostExtension
     /*** ProjectService implementation ****/
     /*** ProjectService implementation ****/
 
 
     /**
     /**
-     * Called when the project is being loaded to allow the typscript language service to reset and
+     * Called when the project is being loaded to allow the typescript language service to reset and
      * possibly compile
      * possibly compile
      */
      */
     projectLoaded(ev: Editor.EditorEvents.LoadProjectEvent) {
     projectLoaded(ev: Editor.EditorEvents.LoadProjectEvent) {
@@ -370,8 +370,7 @@ export default class TypescriptLanguageExtension implements Editor.HostExtension
       // Generate a tsconfig.json file
       // Generate a tsconfig.json file
       const tsconfigFile = new Atomic.File(projectDir + "tsconfig.json", Atomic.FileMode.FILE_WRITE);
       const tsconfigFile = new Atomic.File(projectDir + "tsconfig.json", Atomic.FileMode.FILE_WRITE);
       let tsconfig = {
       let tsconfig = {
-        compilerOptions: defaultCompilerOptions,
-        include: [ "Resources", "typings" ]
+        compilerOptions: defaultCompilerOptions
       };
       };
 
 
       // Don't use fully qualified path in the persistent tsconfig file, just use a relative path from the tsconfig
       // Don't use fully qualified path in the persistent tsconfig file, just use a relative path from the tsconfig

+ 1 - 1
Script/tsconfig.json

@@ -31,7 +31,7 @@
         "./AtomicEditor/hostExtensions/coreExtensions/ProjectBasedExtensionLoader.ts",
         "./AtomicEditor/hostExtensions/coreExtensions/ProjectBasedExtensionLoader.ts",
         "./AtomicEditor/hostExtensions/HostExtensionServices.ts",
         "./AtomicEditor/hostExtensions/HostExtensionServices.ts",
         "./AtomicEditor/hostExtensions/languageExtensions/CSharpLanguageExtension.ts",
         "./AtomicEditor/hostExtensions/languageExtensions/CSharpLanguageExtension.ts",
-        "./AtomicEditor/hostExtensions/languageExtensions/TypscriptLanguageExtension.ts",
+        "./AtomicEditor/hostExtensions/languageExtensions/TypescriptLanguageExtension.ts",
         "./AtomicEditor/hostExtensions/ServiceLocator.ts",
         "./AtomicEditor/hostExtensions/ServiceLocator.ts",
         "./AtomicEditor/main.ts",
         "./AtomicEditor/main.ts",
         "./AtomicEditor/resources/ProjectTemplates.ts",
         "./AtomicEditor/resources/ProjectTemplates.ts",