Browse Source

Fixed issue where the monaco web workers weren't loading. Also fixed a marker error that monaco was throwing.

Shaddock Heath 9 years ago
parent
commit
fe5ce33c77

+ 8 - 0
Data/AtomicEditor/CodeEditor/MonacoEditor.html

@@ -42,6 +42,14 @@
             }
         });
 
+        // Need to override how Monaco web workers are getting resolved since for some reason they can't get located properly
+        // inside the Monaco editor code
+        window.MonacoEnvironment = {
+            getWorkerUrl: function(workerId, label) {
+                return 'source/monaco/vs/base/worker/' + workerId;
+            }
+        };
+
         var setupEditor = new Promise((resolve, reject) => {
             require(['vs/editor/editor.main'], function() {
                 var editor = monaco.editor.create(document.getElementById('editor'));

+ 1 - 1
Script/AtomicWebViewEditor/clientExtensions/languageExtensions/typescript/TypescriptLanguageExtension.ts

@@ -323,7 +323,7 @@ export default class TypescriptLanguageExtension implements Editor.ClientExtensi
                 };
             });
 
-        monaco.editor.setModelMarkers(this.editor.getModel(), "Atomic", markers);
+        monaco.editor.setModelMarkers(this.editor.getModel(), "typescript", markers);
     }
 
     /**

+ 1 - 1
Script/AtomicWebViewEditor/editor/editorCommands.ts

@@ -75,7 +75,7 @@ export function getSourceText(): string {
 export function loadCodeIntoEditor(code: string, filename: string, fileExt: string) {
 
     let monacoEditor = internalEditor.getInternalEditor();
-    let model = monaco.editor.createModel(code, null, monaco.Uri.file(filename));
+    let model = monaco.editor.createModel(code, null, monaco.Uri.parse(filename));
 
     model.updateOptions({
         insertSpaces: serviceLocator.clientServices.getApplicationPreference("codeEditor", "useSoftTabs", true),