Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stylesheet partial parse #46376

Merged
merged 13 commits into from
Mar 27, 2018
4 changes: 2 additions & 2 deletions extensions/emmet/src/defaultCompletionProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import * as vscode from 'vscode';
import { Node } from 'EmmetNode';
import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parseDocument, getEmmetConfiguration, getEmmetMode, isStyleSheet } from './util';
import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument } from './util';

export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {

Expand Down Expand Up @@ -38,7 +38,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi

// If document can be css parsed, get currentNode
if (isStyleSheet(document.languageId)) {
const rootNode = parseDocument(document, false);
const rootNode = document.lineCount > 1000 ? parsePartialStylesheet(document, position) : parseDocument(document, false);
if (!rootNode) {
return;
}
Expand Down
91 changes: 91 additions & 0 deletions extensions/emmet/src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,97 @@ export function parseDocument(document: vscode.TextDocument, showError: boolean
return undefined;
}

export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): Node | undefined {

let startPosition = new vscode.Position(0, 0);
let endPosition = new vscode.Position(document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length);
const closeBrace = 125;
const openBrace = 123;
let slash = 47;
let star = 42;

// Go forward until we found a closing brace.
let stream = new DocumentStreamReader(document, position);
while (!stream.eof()) {
if (stream.eat(closeBrace)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we combine this if with the while?
while (!stream.eof() && !stream.eat(closeBrace))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we can

break;
} else if (stream.eat(slash)) {
if (stream.eat(slash) && document.languageId !== 'css') {
// Single line Comment, we continue searching from next line.
stream.pos = new vscode.Position(stream.pos.line + 1, 0);
} else if (stream.eat(star)) {
// Start of block comment, we need to find the closing '*/'
let endCommentFound = false;
while (!endCommentFound) {
stream.eatWhile(char => { return char !== star; });
stream.eat(star);
endCommentFound = stream.eat(slash);
}
}
} else {
stream.next();
}
}

endPosition = stream.pos;

// Go back until we found an opening brace. If we find a closing one, we first find its opening brace and then we continue.
stream.pos = position;
let openBracesRemaining = 1;
let currentLine = position.line;
let isCSS = document.languageId === 'css';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be pulled up as it can be used when determining the single line comments above


while (openBracesRemaining > 0 && !stream.sof()) {
if (position.line - stream.pos.line > 1000) {
return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
} else if (!isCSS && stream.pos.line !== currentLine) {
// In not CSS stylesheets, we need to skip singleLine comments.
currentLine = stream.pos.line;
let startLineComment = document.lineAt(currentLine).text.indexOf('//');
if (startLineComment > -1) {
stream.pos = new vscode.Position(currentLine, startLineComment);
}
}
let ch = stream.backUp(1);
if (ch === openBrace) {
openBracesRemaining--;
} else if (ch === closeBrace) {
if (isCSS) {
stream.next();
return parseStylesheet(new DocumentStreamReader(document, stream.pos, new vscode.Range(stream.pos, endPosition)));
}
openBracesRemaining++;
} else if (ch === slash) {
stream.backUp(1);
if (!stream.eat(char => { return char !== star; })) {
Copy link
Contributor

@ramya-rao-a ramya-rao-a Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not stream.eat(star)?

Copy link
Contributor Author

@gushuro gushuro Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is emulating a stream.eatback(star).
I changed it so that is easier to read and understand.

// Closing block comment. We need to find the corresponding opening '*/'
stream.pos = findOpeningComment(document, stream.pos);
}
}
}
// We are at an opening brace. We need to include its selector, but with one nonspace character is enough.
while (!stream.sof()) {
let ch = stream.backUp(1);
if (ch === closeBrace || ch === openBrace) {
Copy link
Contributor

@ramya-rao-a ramya-rao-a Mar 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't really need the whole selector, we can stop when we find a non whitespace as well

stream.next();
break;
} else if (!String.fromCharCode(ch).match(/\s/)) {
break;
}
}
startPosition = stream.pos;
try {
return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
} catch (e) {
}
}

function findOpeningComment(document: vscode.TextDocument, position: vscode.Position): vscode.Position {
let text = document.getText(new vscode.Range(0, 0, position.line, position.character));
let offset = text.lastIndexOf('/*');
return document.positionAt(offset);
}

/**
* Returns node corresponding to given position in the given root node
*/
Expand Down