microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 16:58:55 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Fixes #12398: Problem in indent guidelines

Browse Source
This commit is contained in:
Alex Dima
2016-09-27 15:11:05 +03:00
parent a6d1204301
commit 09ece5594d
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/editor/common/model/textModel.ts
View File

@@ -488,6 +488,15 @@ export class TextModel extends OrderGuaranteeEventEmitter implements editorCommo
return IndentRange.deepCloneArr(indentRanges);
}
private _toValidLineIndentGuide(lineNumber:number, indentGuide:number): number {
let lineIndentLevel = this._lines[lineNumber - 1].getIndentLevel();
if (lineIndentLevel === -1) {
return indentGuide;
}
let maxIndentGuide = Math.ceil(lineIndentLevel / this._options.tabSize);
return Math.min(maxIndentGuide, indentGuide);
}
public getLineIndentGuide(lineNumber:number): number {
if (lineNumber < 1 || lineNumber > this.getLineCount()) {
throw new Error('Illegal value ' + lineNumber + ' for `lineNumber`');
@@ -499,10 +508,10 @@ export class TextModel extends OrderGuaranteeEventEmitter implements editorCommo
let rng = indentRanges[i];
if (rng.startLineNumber === lineNumber) {
return Math.ceil(rng.indent / this._options.tabSize);
return this._toValidLineIndentGuide(lineNumber, Math.ceil(rng.indent / this._options.tabSize));
}
if (rng.startLineNumber < lineNumber && lineNumber <= rng.endLineNumber) {
return 1 + Math.floor(rng.indent / this._options.tabSize);
return this._toValidLineIndentGuide(lineNumber, 1 + Math.floor(rng.indent / this._options.tabSize));
}
if (rng.endLineNumber + 1 === lineNumber) {
let bestIndent = rng.indent;
@@ -513,7 +522,7 @@ export class TextModel extends OrderGuaranteeEventEmitter implements editorCommo
bestIndent = rng.indent;
}
}
return Math.ceil(bestIndent / this._options.tabSize);
return this._toValidLineIndentGuide(lineNumber, Math.ceil(bestIndent / this._options.tabSize));
}
}

8
src/vs/editor/test/common/model/textModel.test.ts
View File

@@ -721,4 +721,12 @@ suite('TextModel.getLineIndentGuide', () => {
[0, '}'],
]);
});
test('issue #12398 - Problem in indent guidelines', () => {
assertIndentGuides([
[2, '\t\t.bla'],
[3, '\t\t\tlabel(for)'],
[0, 'include script'],
]);
});
});