Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-23 19:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[html] enable handlebars

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-09-14 11:11:45 +02:00
parent fa30ab77ef
commit b66b9871a0
5 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
extensions/html/server/src/service/parser/htmlScanner.ts
View File

@@ -206,6 +206,10 @@ export interface Scanner {
getScannerState(): ScannerState;
}
const htmlScriptContents = {
'text/x-handlebars-template': true
};
export function createScanner(input: string, initialOffset = 0, initialState: ScannerState = ScannerState.WithinContent) : Scanner {
let stream = new MultiLineStream(input, initialOffset);
@@ -216,6 +220,8 @@ export function createScanner(input: string, initialOffset = 0, initialState: Sc
let hasSpaceAfterTag: boolean;
let lastTag: string;
let lastAttributeName: string;
let lastTypeValue: string;
function nextElementName(): string {
return stream.advanceIfRegExp(/^[_:\w][_:\w-.\d]*/).toLowerCase();
@@ -299,6 +305,8 @@ export function createScanner(input: string, initialOffset = 0, initialState: Sc
break;
case ScannerState.AfterOpeningStartTag:
lastTag = nextElementName();
lastTypeValue = null;
lastAttributeName = null;
if (lastTag.length > 0) {
hasSpaceAfterTag = false;
state = ScannerState.WithinTag;
@@ -316,8 +324,8 @@ export function createScanner(input: string, initialOffset = 0, initialState: Sc
return finishToken(offset, TokenType.Whitespace);
}
if (hasSpaceAfterTag) {
let name = nextAttributeName();
if (name.length > 0) {
lastAttributeName = nextAttributeName();
if (lastAttributeName.length > 0) {
state = ScannerState.AfterAttributeName;
hasSpaceAfterTag = false;
return finishToken(offset, TokenType.AttributeName);
@@ -329,7 +337,12 @@ export function createScanner(input: string, initialOffset = 0, initialState: Sc
}
if (stream.advanceIfChar(_RAN)) { // >
if (lastTag === 'script') {
state = ScannerState.WithinScriptContent;
if (lastTypeValue && htmlScriptContents[lastTypeValue]) {
// stay in html
state = ScannerState.WithinContent;
} else {
state = ScannerState.WithinScriptContent;
}
} else if (lastTag === 'style') {
state = ScannerState.WithinStyleContent;
} else {
@@ -357,6 +370,9 @@ export function createScanner(input: string, initialOffset = 0, initialState: Sc
}
let attributeValue = stream.advanceIfRegExp(/^[^\s"'`=<>]+/);
if (attributeValue.length > 0) {
if (lastAttributeName === 'type') {
lastTypeValue = attributeValue;
}
state = ScannerState.WithinTag;
hasSpaceAfterTag = false;
return finishToken(offset, TokenType.AttributeValue);
@@ -367,6 +383,9 @@ export function createScanner(input: string, initialOffset = 0, initialState: Sc
if (stream.advanceUntilChar(ch)) {
stream.advance(1); // consume quote
}
if (lastAttributeName === 'type') {
lastTypeValue = stream.getSource().substring(offset + 1, stream.pos() - 1);
}
state = ScannerState.WithinTag;
hasSpaceAfterTag = false;
return finishToken(offset, TokenType.AttributeValue);

11
extensions/html/server/src/service/test/completion.test.ts
View File

@@ -269,6 +269,17 @@ suite('HTML Completion', () => {
], testDone);
});
suite('Handlevar Completion', (testDone) => {
run([
testCompletionFor('<script id="entry-template" type="text/x-handlebars-template"> | </script>' , {
items: [
{ label: 'div', resultText: '<script id="entry-template" type="text/x-handlebars-template"> <div></div> </script>' },
]
})
], testDone);
});
test('Intellisense aria', function (testDone): any {
let expectedAriaAttributes = [
{ label: 'aria-activedescendant' },