Javascript mode instantiated twice, issue microsoft#34

mjbvz · Nov 17, 2015 · df35236 · df35236
1 parent a4bfcb8
commit df35236
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts
@@ -187,13 +187,17 @@ export class ModeServiceImpl implements IModeService {
 		if (this._activationPromises.hasOwnProperty(modeId)) {
 			return this._activationPromises[modeId];
 		}
-
-		this._activationPromises[modeId] = this._createMode(modeId).then((mode) => {
+		var c, e;
+		var promise = new TPromise((cc,ee,pp) => { c = cc; e = ee; });
+		this._activationPromises[modeId] = promise;
+
+		this._createMode(modeId).then((mode) => {
 			this._instantiatedModes[modeId] = mode;
 			delete this._activationPromises[modeId];
 			return this._instantiatedModes[modeId];
-		});
-		return this._activationPromises[modeId];
+		}).then(c, e);
+
+		return promise;
 	}
 
 	protected _createMode(modeId:string): TPromise<Modes.IMode> {