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

Emmet Error handling Fixes #29897

Browse Source
This commit is contained in:
Ramya Achutha Rao
2017-06-29 18:35:53 -07:00
parent e7de8b2536
commit 0ee00cbd2a
15 changed files with 129 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/emmet/src/toggleComment.ts
View File

@@ -4,11 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
import { getNodesInBetween, getNode } from './util';
import parse from '@emmetio/html-matcher';
import parseStylesheet from '@emmetio/css-parser';
import { getNodesInBetween, getNode, parse } from './util';
import { Node, Stylesheet } from 'EmmetNode';
import { DocumentStreamReader } from './bufferStream';
import { isStyleSheet } from 'vscode-emmet-helper';
const startCommentStylesheet = '/*';
@@ -26,24 +23,22 @@ export function toggleComment() {
let toggleCommentInternal;
let startComment;
let endComment;
let parseContent;
if (isStyleSheet(editor.document.languageId)) {
parseContent = parseStylesheet;
toggleCommentInternal = toggleCommentStylesheet;
startComment = startCommentStylesheet;
endComment = endCommentStylesheet;
} else {
parseContent = parse;
toggleCommentInternal = toggleCommentHTML;
startComment = startCommentHTML;
endComment = endCommentHTML;
}
let rootNode = parseContent(new DocumentStreamReader(editor.document));
let rootNode = parse(editor.document);
if (!rootNode) {
return;
}
editor.edit(editBuilder => {
editor.selections.reverse().forEach(selection => {
let [rangesToUnComment, rangeToComment] = toggleCommentInternal(editor.document, selection, rootNode);