Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into octref/pathCompletion

Browse Source
This commit is contained in:
Pine
2018-03-20 14:25:31 -07:00
committed by GitHub
parent e394797455 2f5061ff2d
commit d2b9a7cc45
259 changed files with 3386 additions and 1519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/html-language-features/server/src/modes/javascriptMode.ts
View File

@@ -292,9 +292,9 @@ export function getJavascriptMode(documentRegions: LanguageModelCache<HTMLDocume
let endLine = curr.end.line;
if (startLine < endLine && startLine >= rangeStartLine && endLine < rangeEndLine) {
let foldingRange: FoldingRange = { startLine, endLine };
let match = document.getText(curr).match(/^\s*\/(\/\s*#(?:end)?region\b)|([\*\/])/);
let match = document.getText(curr).match(/^\s*\/(?:(\/\s*#(?:end)?region\b)|(\*|\/))/);
if (match) {
foldingRange.type = match[1].length ? FoldingRangeType.Region : FoldingRangeType.Comment;
foldingRange.type = match[1] ? FoldingRangeType.Region : FoldingRangeType.Comment;
}
ranges.push(foldingRange);
}

2
extensions/html-language-features/server/src/test/completions.test.ts
View File

@@ -22,7 +22,7 @@ export interface ItemDescription {
}
suite('Completions', () => {
suite('HTML Completions', () => {
let assertCompletion = function (completions: CompletionList, expected: ItemDescription, document: TextDocument, offset: number) {
let matches = completions.items.filter(completion => {

2
extensions/html-language-features/server/src/test/documentContext.test.ts
View File

@@ -7,7 +7,7 @@
import * as assert from 'assert';
import { getDocumentContext } from '../utils/documentContext';
suite('Document Context', () => {
suite('HTML Document Context', () => {
test('Context', function (): any {
const docURI = 'file:///users/test/folder/test.html';

2
extensions/html-language-features/server/src/test/emmet.test.ts
View File

@@ -15,7 +15,7 @@ import * as embeddedSupport from '../modes/embeddedSupport';
import { getEmmetCompletionParticipants } from 'vscode-emmet-helper';
import { getCSSMode } from '../modes/cssMode';
suite('Emmet Support', () => {
suite('HTML Emmet Support', () => {
const htmlLanguageService = getLanguageService();

8
extensions/html-language-features/server/src/test/folding.test.ts
View File

@@ -34,7 +34,7 @@ function r(startLine: number, endLine: number, type?: string): ExpectedIndentRan
return { startLine, endLine, type };
}
suite('Object Folding', () => {
suite('HTML Folding', () => {
test('Fold one level', () => {
let input = [
/*0*/'<html>',
@@ -130,7 +130,7 @@ suite('Object Folding', () => {
/* 6*/' };',
/* 7*/'</script>',
/* 8*/'<script>',
/* 9*/' test(() => {',
/* 9*/' test(() => { // hello',
/*10*/' f();',
/*11*/' });',
/*12*/'</script>',
@@ -206,7 +206,7 @@ suite('Object Folding', () => {
/*2*/'</div>',
];
assertRanges(input, [r(0, 1)]);
});
});
test('Fold intersecting region', () => {
let input = [
@@ -218,7 +218,7 @@ suite('Object Folding', () => {
/*5*/'<!-- #endregion -->',
];
assertRanges(input, [r(0, 3)]);
});
});
test('Test limit', () => {

2
extensions/html-language-features/server/src/test/words.test.ts
View File

@@ -7,7 +7,7 @@
import * as assert from 'assert';
import * as words from '../utils/strings';
suite('Words', () => {
suite('HTML Words', () => {
let wordRegex = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;