development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-11-05 18:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop supporting both syntaxProfiles, includeLanguage settings in new emmet #29678

Browse source
This commit is contained in:
Ramya Achutha Rao 2017-06-28 14:51:57 -07:00
parent 04f25df845
commit 2f77f9fd6a
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/emmet/src/util.ts
View file

@ -25,9 +25,13 @@ export const LANGUAGE_MODES: Object = {
'typescriptreact': ['.', '}']
};
// Explicitly map languages to their parent language to get emmet completion support
// Explicitly map languages that have built-in grammar in VS Code to their parent language
// to get emmet completion support
// For other languages, users will have to use `emmet.includeLanguages` or
// language specific extensions can provide emmet completion support
export const MAPPED_MODES: Object = {
'handlebars': 'html'
'handlebars': 'html',
'php': 'html'
};
export function validate(allowStylesheet: boolean = true): boolean {
let editor = vscode.window.activeTextEditor;

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

@ -314,9 +314,7 @@ export abstract class EmmetEditorAction extends EditorAction {
if (configurationService.getConfiguration<IEmmetConfiguration>().emmet.useNewEmmet
&& (mappedCommand === 'emmet.expandAbbreviation' || mappedCommand === 'emmet.wrapWithAbbreviation')) {
return commandService.executeCommand<void>(mappedCommand, { language: editorAccessor.getSyntax() });
// Below is for when disucssion at https://github.com/Microsoft/vscode/issues/29678 is resolved
//return commandService.executeCommand<void>(mappedCommand, editorAccessor.getLanguage());
return commandService.executeCommand<void>(mappedCommand, editorAccessor.getLanguage());
}
if (!editorAccessor.isEmmetEnabledMode()) {