Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Emmet suggestions in non markup/stylesheet languages #29532

Browse Source
This commit is contained in:
Ramya Achutha Rao
2017-06-28 13:59:28 -07:00
parent e692fc72c6
commit 7ba1dcff0c
6 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/emmet/src/abbreviationActions.ts
View File

@@ -8,8 +8,8 @@ import { expand } from '@emmetio/expand-abbreviation';
import parseStylesheet from '@emmetio/css-parser';
import parse from '@emmetio/html-matcher';
import { Node, HtmlNode, Rule } from 'EmmetNode';
import { getNode, getInnerRange, getMappedSyntax } from './util';
import { getExpandOptions, extractAbbreviation, isStyleSheet, isAbbreviationValid } from 'vscode-emmet-helper';
import { getNode, getInnerRange, getMappingForIncludedLanguages } from './util';
import { getExpandOptions, extractAbbreviation, isStyleSheet, isAbbreviationValid, getEmmetMode } from 'vscode-emmet-helper';
import { DocumentStreamReader } from './bufferStream';
interface ExpandAbbreviationInput {
@@ -208,10 +208,15 @@ function getSyntaxFromArgs(args: any): string {
vscode.window.showInformationMessage('Cannot resolve language at cursor.');
return;
}
let syntax = getMappedSyntax(args['language']);
const mappedModes = getMappingForIncludedLanguages();
let language: string = args['language'];
let parentMode: string = args['parentMode'];
let syntax = getEmmetMode(mappedModes[language] ? mappedModes[language] : language);
if (syntax) {
return syntax;
}
return getMappedSyntax(args['parentMode']);
return getEmmetMode(mappedModes[parentMode] ? mappedModes[parentMode] : parentMode);
}