development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 11:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Since wrap with abbr is not supported in css, it can fallback to html

Browse source
This commit is contained in:
Ramya Achutha Rao 2017-08-01 18:23:39 -07:00
parent cdcadccc37
commit e73bb91dc1
7 changed files with 12 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extensions/emmet/package.json
View file

@ -78,6 +78,11 @@
}
},
"commands": [
{
"command": "editor.emmet.action.wrapWithAbbreviation",
"title": "%command.wrapWithAbbreviation%",
"category": "Emmet"
},
{
"command": "editor.emmet.action.removeTag",
"title": "%command.removeTag%",

1
extensions/emmet/package.nls.json
View file

@ -1,4 +1,5 @@
{
"command.wrapWithAbbreviation": "Wrap with Abbreviation",
"command.removeTag": "Remove Tag",
"command.updateTag": "Update Tag",
"command.matchTag": "Go to Matching Pair",

4
extensions/emmet/src/abbreviationActions.ts
View file

@ -17,13 +17,13 @@ interface ExpandAbbreviationInput {
}
export function wrapWithAbbreviation(args) {
const syntax = getSyntaxFromArgs(args);
if (!syntax || !validate()) {
if (!validate(false)) {
return;
}
const editor = vscode.window.activeTextEditor;
const abbreviationPromise = (args && args['abbreviation']) ? Promise.resolve(args['abbreviation']) : vscode.window.showInputBox({ prompt: 'Enter Abbreviation' });
const syntax = getSyntaxFromArgs({ language: editor.document.languageId }) || 'html';
return abbreviationPromise.then(abbreviation => {
if (!abbreviation || !abbreviation.trim() || !isAbbreviationValid(syntax, abbreviation)) { return; }

2
extensions/emmet/src/extension.ts
View file

@ -27,7 +27,7 @@ import * as path from 'path';
export function activate(context: vscode.ExtensionContext) {
registerCompletionProviders(context, true);
context.subscriptions.push(vscode.commands.registerCommand('emmet.wrapWithAbbreviation', (args) => {
context.subscriptions.push(vscode.commands.registerCommand('editor.emmet.action.wrapWithAbbreviation', (args) => {
wrapWithAbbreviation(args);
}));

27
src/vs/workbench/parts/emmet/electron-browser/actions/wrapWithAbbreviation.ts
View file

@ -1,27 +0,0 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import nls = require('vs/nls');
import { EmmetEditorAction } from 'vs/workbench/parts/emmet/electron-browser/emmetActions';
import { editorAction } from 'vs/editor/common/editorCommonExtensions';
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
@editorAction
class WrapWithAbbreviationAction extends EmmetEditorAction {
constructor() {
super({
id: 'editor.emmet.action.wrapWithAbbreviation',
label: nls.localize('wrapWithAbbreviationAction', "Emmet: Wrap with Abbreviation"),
alias: 'Emmet: Wrap with Abbreviation',
precondition: EditorContextKeys.writable,
actionName: 'wrap_with_abbreviation'
});
}
}

1
src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.ts
View file

@ -6,5 +6,4 @@
'use strict';
import './actions/expandAbbreviation';
import './actions/wrapWithAbbreviation';

14
src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts
View file

@ -57,11 +57,6 @@ export interface IEmmetActionOptions extends IActionOptions {
export abstract class EmmetEditorAction extends EditorAction {
private actionMap = {
'editor.emmet.action.wrapWithAbbreviation': 'emmet.wrapWithAbbreviation',
'editor.emmet.action.expandAbbreviation': 'emmet.expandAbbreviation'
};
protected emmetActionName: string;
constructor(opts: IEmmetActionOptions) {
@ -88,15 +83,10 @@ export abstract class EmmetEditorAction extends EditorAction {
const modeService = accessor.get(IModeService);
const commandService = accessor.get(ICommandService);
let mappedCommand = this.actionMap[this.id];
if (mappedCommand && mappedCommand !== 'emmet.expandAbbreviation' && mappedCommand !== 'emmet.wrapWithAbbreviation') {
return commandService.executeCommand<void>(mappedCommand);
}
return this._withGrammarContributions(extensionService).then((grammarContributions) => {
if (mappedCommand === 'emmet.expandAbbreviation' || mappedCommand === 'emmet.wrapWithAbbreviation') {
return commandService.executeCommand<void>(mappedCommand, EmmetEditorAction.getLanguage(modeService, editor, grammarContributions));
if (this.id === 'editor.emmet.action.expandAbbreviation') {
return commandService.executeCommand<void>('emmet.expandAbbreviation', EmmetEditorAction.getLanguage(modeService, editor, grammarContributions));
}
return undefined;