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

HTML Server crashes fixes #16314

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-12-01 09:27:25 +01:00
parent 50c4955e59
commit cdc432d939
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/html/server/src/modes/embeddedSupport.ts
View File

@@ -64,8 +64,8 @@ export function getDocumentRegions(languageService: LanguageService, document: T
languageIdFromType = void 0;
}
} else {
let attributelLanguageId = getAttributeLanguage(lastAttributeName);
if (attributelLanguageId) {
let attributeLanguageId = getAttributeLanguage(lastAttributeName);
if (attributeLanguageId) {
let start = scanner.getTokenOffset();
let end = scanner.getTokenEnd();
let firstChar = document.getText()[start];
@@ -73,7 +73,7 @@ export function getDocumentRegions(languageService: LanguageService, document: T
start++;
end--;
}
regions.push({ languageId: attributelLanguageId, start, end, attributeValue: true });
regions.push({ languageId: attributeLanguageId, start, end, attributeValue: true });
}
}
lastAttributeName = null;
@@ -135,7 +135,7 @@ function getLanguageRanges(document: TextDocument, regions: EmbeddedRegion[], ra
function getLanguagesInDocument(document: TextDocument, regions: EmbeddedRegion[]): string[] {
let result = [];
for (let region of regions) {
if (result.indexOf(region.languageId) === -1) {
if (region.languageId && result.indexOf(region.languageId) === -1) {
result.push(region.languageId);
if (result.length === 3) {
return result;

9
extensions/html/server/src/modes/languageModes.ts
View File

@@ -85,7 +85,14 @@ export function getLanguageModes(supportedLanguages: { [languageId: string]: boo
});
},
getAllModesInDocument(document: TextDocument): LanguageMode[] {
return documentRegions.get(document).getLanguagesInDocument().map(languageId => modes[languageId]);
let modes = [];
for (let languageId of documentRegions.get(document).getLanguagesInDocument()) {
let mode = modes[languageId];
if (mode) {
modes.push(mode);
}
}
return modes;
},
getAllModes(): LanguageMode[] {
let result = [];