Merge branch 'master' into ngates/lazy-monaco-refs

TypeFox · Aug 11, 2017 · 7d4b09d · 7d4b09d
2 parents c40b409 + 493188f
commit 7d4b09d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/example/package.json b/example/package.json
@@ -23,18 +23,18 @@
     "webpack": "^2.3.3"
   },
   "scripts": {
-    "compile": "./node_modules/.bin/tsc",
-    "watch": "./node_modules/.bin/tsc -w",
-    "clean": "./node_modules/.bin/rimraf lib",
+    "compile": "tsc",
+    "watch": "tsc -w",
+    "clean": "rimraf lib",
     "copy": "cp src/index.html lib/index.html",
-    "build": "npm run compile && ./node_modules/.bin/webpack && npm run copy",
+    "build": "npm run compile && webpack && npm run copy",
     "start": "npm run build && node lib/server.js",
     "start:ext": "npm run build && node lib/server.js --external",
     "update:file-deps": "npm run clean:file-deps && npm install",
     "clean:file-deps": "npm run clean:monaco-languageclient && npm run clean:vscode-ws-jsonrpc",
     "update:monaco-languageclient": "npm run clean:monaco-languageclient && npm install",
-    "clean:monaco-languageclient": "./node_modules/.bin/rimraf node_modules/monaco-languageclient",
+    "clean:monaco-languageclient": "rimraf node_modules/monaco-languageclient",
     "update:vscode-ws-jsonrpc": "npm run clean:vscode-ws-jsonrpc && npm install",
-    "clean:vscode-ws-jsonrpc": "./node_modules/.bin/rimraf node_modules/vscode-ws-jsonrpc"
+    "clean:vscode-ws-jsonrpc": "rimraf node_modules/vscode-ws-jsonrpc"
   }
 }
diff --git a/src/workspace.ts b/src/workspace.ts
@@ -8,14 +8,14 @@ import IModel = monaco.editor.IModel;
 
 export class MonacoWorkspace implements Workspace {
 
-    protected _rootUri: string | null = null;
-
     protected readonly documents = new Map<string, TextDocument>();
     protected readonly onDidOpenTextDocumentEmitter = new Emitter<TextDocument>();
     protected readonly onDidCloseTextDocumentEmitter = new Emitter<TextDocument>();
     protected readonly onDidChangeTextDocumentEmitter = new Emitter<TextDocumentDidChangeEvent>();
 
-    constructor(protected readonly m2p: MonacoToProtocolConverter) {
+    constructor(
+        protected readonly m2p: MonacoToProtocolConverter,
+        protected _rootUri: string | null = null) {
         for (const model of monaco.editor.getModels()) {
             this.addModel(model);
         }