Small tweaks to PR #8155

microsoft · Jun 27, 2016 · 767009f · 767009f
1 parent 382ebf6
commit 767009f
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 74 deletions.
diff --git a/src/vs/workbench/parts/emmet/node/actions/balance.ts b/src/vs/workbench/parts/emmet/node/actions/balance.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/base64.ts b/src/vs/workbench/parts/emmet/node/actions/base64.ts
@@ -9,8 +9,8 @@ import nls = require('vs/nls');
 
 import * as Paths from 'vs/base/common/paths';
 import {fileExists} from 'vs/base/node/pfs';
-import {createPath} from '../fileAccessor';
-import {EmmetEditorAction} from '../emmetActions';
+import {createPath} from 'vs/workbench/parts/emmet/node/fileAccessor';
+import {EmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 import {Action} from 'vs/base/common/actions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
@@ -31,10 +31,10 @@ class EncodeDecodeDataUrlAction extends EmmetEditorAction {
 		super(descriptor, editor, configurationService);
 	}
 
-	public runEmmetAction(_module) {
+	public runEmmetAction(_emmet) {
 		const currentLine = this.editorAccessor.getCurrentLine();
 		if (!this.isDataURI(currentLine)) {
-			this.encodeDecode(_module);
+			this.encodeDecode(_emmet);
 			return;
 		}
 
@@ -56,28 +56,28 @@ class EncodeDecodeDataUrlAction extends EmmetEditorAction {
 			})
 			.then(status => {
 				if (!status) {
-					this.encodeDecode(_module, this.imageFilePath);
+					this.encodeDecode(_emmet, this.imageFilePath);
 					return;
 				}
 
 				const message = nls.localize('warnEscalation', "File **{0}** already exists.  Do you want to overwrite the existing file?", this.imageFilePath);
 				const actions = [
 					new Action('cancel', nls.localize('cancel', "Cancel"), '', true),
 					new Action('ok', nls.localize('ok', "OK"), '', true, () => {
-						this.encodeDecode(_module, this.imageFilePath);
+						this.encodeDecode(_emmet, this.imageFilePath);
 						return null;
 					})
 				];
 				this.messageService.show(Severity.Warning, { message, actions });
 			});
 	}
 
-	public encodeDecode(_module: any, filepath?: string) {
+	public encodeDecode(_emmet: any, filepath?: string) {
 		this.editorAccessor.prompt = (): string => {
 			return filepath;
 		};
 
-		if (!_module.run('encode_decode_data_url', this.editorAccessor)) {
+		if (!_emmet.run('encode_decode_data_url', this.editorAccessor)) {
 			this.editorAccessor.noExpansionOccurred();
 		}
 	}

diff --git a/src/vs/workbench/parts/emmet/node/actions/editPoints.ts b/src/vs/workbench/parts/emmet/node/actions/editPoints.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/evaluateMath.ts b/src/vs/workbench/parts/emmet/node/actions/evaluateMath.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.ts b/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.ts b/src/vs/workbench/parts/emmet/node/actions/incrementDecrement.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/matchingPair.ts b/src/vs/workbench/parts/emmet/node/actions/matchingPair.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/mergeLines.ts b/src/vs/workbench/parts/emmet/node/actions/mergeLines.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.ts b/src/vs/workbench/parts/emmet/node/actions/reflectCssValue.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/removeTag.ts b/src/vs/workbench/parts/emmet/node/actions/removeTag.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/selectItem.ts b/src/vs/workbench/parts/emmet/node/actions/selectItem.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.ts b/src/vs/workbench/parts/emmet/node/actions/splitJoinTag.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/updateImageSize.ts b/src/vs/workbench/parts/emmet/node/actions/updateImageSize.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {BasicEmmetEditorAction} from '../emmetEditorAction';
+import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';

diff --git a/src/vs/workbench/parts/emmet/node/actions/updateTag.ts b/src/vs/workbench/parts/emmet/node/actions/updateTag.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {EmmetEditorAction} from '../emmetActions';
+import {EmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';
@@ -23,18 +23,18 @@ class UpdateTagAction extends EmmetEditorAction {
 		super(descriptor, editor, configurationService);
 	}
 
-	public runEmmetAction(_module) {
+	public runEmmetAction(_emmet) {
 		let options: IInputOptions = {
 			prompt: nls.localize('enterTag', 'Enter Tag'),
 			placeHolder: nls.localize('tag', 'Tag')
 		};
 		this.quickOpenService.input(options).then(tag => {
-			this.wrapAbbreviation(_module, tag);
+			this.wrapAbbreviation(_emmet, tag);
 		});
 	}
 
-	private wrapAbbreviation(_module: any, tag) {
-		if (!_module.run('update_tag', this.editorAccessor, tag)) {
+	private wrapAbbreviation(_emmet: any, tag) {
+		if (!_emmet.run('update_tag', this.editorAccessor, tag)) {
 			this.editorAccessor.noExpansionOccurred();
 		}
 	}

diff --git a/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.ts b/src/vs/workbench/parts/emmet/node/actions/wrapWithAbbreviation.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import nls = require('vs/nls');
-import {EmmetEditorAction} from '../emmetActions';
+import {EmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions';
 
 import {CommonEditorRegistry, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';
@@ -23,18 +23,18 @@ class WrapWithAbbreviationAction extends EmmetEditorAction {
 		super(descriptor, editor, configurationService);
 	}
 
-	public runEmmetAction(_module) {
+	public runEmmetAction(_emmet) {
 		let options: IInputOptions = {
 			prompt: nls.localize('enterAbbreviation', "Enter Abbreviation"),
 			placeHolder: nls.localize('abbreviation', "Abbreviation")
 		};
 		this.quickOpenService.input(options).then(abbreviation => {
-			this.wrapAbbreviation(_module, abbreviation);
+			this.wrapAbbreviation(_emmet, abbreviation);
 		});
 	}
 
-	private wrapAbbreviation(_module: any, abbreviation) {
-		if (!_module.run('wrap_with_abbreviation', this.editorAccessor, abbreviation)) {
+	private wrapAbbreviation(_emmet: any, abbreviation) {
+		if (!_emmet.run('wrap_with_abbreviation', this.editorAccessor, abbreviation)) {
 			this.editorAccessor.noExpansionOccurred();
 		}
 	}

diff --git a/src/vs/workbench/parts/emmet/node/emmetActions.ts b/src/vs/workbench/parts/emmet/node/emmetActions.ts
@@ -9,8 +9,9 @@ import {TPromise} from 'vs/base/common/winjs.base';
 import {IEditorActionDescriptorData, ICommonCodeEditor} from 'vs/editor/common/editorCommon';
 import {EditorAction} from 'vs/editor/common/editorAction';
 import {Behaviour} from 'vs/editor/common/editorActionEnablement';
-import {EditorAccessor} from './editorAccessor';
-import * as fileAccessor from './fileAccessor';
+
+import {EditorAccessor} from 'vs/workbench/parts/emmet/node/editorAccessor';
+import * as fileAccessor from 'vs/workbench/parts/emmet/node/fileAccessor';
 import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
 
 interface IEmmetConfiguration {
@@ -32,52 +33,69 @@ export abstract class EmmetEditorAction extends EditorAction {
 		this.configurationService = configurationService;
 	}
 
-	private updateEmmetPreferences(_module: any) {
+	private updateEmmetPreferences(_emmet: any) {
 		let preferences = this.configurationService.getConfiguration<IEmmetConfiguration>().emmet.preferences;
 		for (let key in preferences) {
 			try {
-				_module.preferences.set(key, preferences[key]);
+				_emmet.preferences.set(key, preferences[key]);
 			} catch (err) {
-				_module.preferences.define(key, preferences[key]);
+				_emmet.preferences.define(key, preferences[key]);
 			}
 		}
 		let syntaxProfile = this.configurationService.getConfiguration<IEmmetConfiguration>().emmet.syntaxProfiles;
 		if (Object.keys(syntaxProfile).length !== 0) {
-			_module.profile.reset();
-			_module.loadProfiles(syntaxProfile);
+			_emmet.profile.reset();
+			_emmet.loadProfiles(syntaxProfile);
 		}
 	}
 
-	private resetEmmetPreferences(_module: any) {
+	private resetEmmetPreferences(_emmet: any) {
 		let preferences = this.configurationService.getConfiguration<IEmmetConfiguration>().emmet.preferences;
 		for (let key in preferences) {
 			try {
-				_module.preferences.remove(key);
+				_emmet.preferences.remove(key);
 			} catch (err) {
 			}
 		}
 	}
 
-	abstract runEmmetAction(_module: any);
+	abstract runEmmetAction(_emmet: any);
 
 	public run(): TPromise<boolean> {
 		return new TPromise((c, e) => {
-			require(['emmet'], (_module) => {
-				_module.file(fileAccessor);
+			require(['emmet'], (_emmet) => {
+				_emmet.file(fileAccessor);
 
 				try {
 					if (!this.editorAccessor.isEmmetEnabledMode()) {
 						this.editorAccessor.noExpansionOccurred();
 						return;
 					}
-					this.updateEmmetPreferences(_module);
-					this.runEmmetAction(_module);
+					this.updateEmmetPreferences(_emmet);
+					this.runEmmetAction(_emmet);
 				} catch (err) {
 					//
 				} finally {
-					this.resetEmmetPreferences(_module);
+					this.resetEmmetPreferences(_emmet);
 				}
 			}, e);
 		});
 	}
 }
+
+export class BasicEmmetEditorAction extends EmmetEditorAction {
+
+	private emmetActionName: string;
+
+	constructor(descriptor: IEditorActionDescriptorData, editor: ICommonCodeEditor, @IConfigurationService configurationService: IConfigurationService, actionName: string) {
+		super(descriptor, editor, configurationService);
+		this.editorAccessor = new EditorAccessor(editor);
+		this.emmetActionName = actionName;
+	}
+
+	public runEmmetAction(_emmet) {
+		if (!_emmet.run(this.emmetActionName, this.editorAccessor)) {
+			this.editorAccessor.noExpansionOccurred();
+		}
+	}
+}
diff --git a/src/vs/workbench/parts/emmet/node/emmetEditorAction.ts b/src/vs/workbench/parts/emmet/node/emmetEditorAction.ts