提交 08f5e5d4 编写于 作者: A Alex Dima

Explicit getters and setters for IModelLine.isInvalid (#30180)

上级 c851d5df
......@@ -160,7 +160,6 @@ function computePlusOneIndentLevel(line: string, tabSize: number): number {
export interface IModelLine {
readonly text: string;
isInvalid: boolean;
// --- markers
addMarker(marker: LineMarker): void;
......@@ -171,6 +170,8 @@ export interface IModelLine {
// --- tokenization
resetTokenizationState(): void;
isInvalid(): boolean;
setIsInvalid(isInvalid: boolean): void;
getState(): IState;
setState(state: IState): void;
getTokens(topLevelLanguageId: LanguageId): LineTokens;
......@@ -198,12 +199,12 @@ export class ModelLine implements IModelLine {
*/
private _metadata: number;
public get isInvalid(): boolean {
public isInvalid(): boolean {
return (this._metadata & 0x00000001) ? true : false;
}
public set isInvalid(value: boolean) {
this._metadata = (this._metadata & 0xfffffffe) | (value ? 1 : 0);
public setIsInvalid(isInvalid: boolean): void {
this._metadata = (this._metadata & 0xfffffffe) | (isInvalid ? 1 : 0);
}
/**
......
......@@ -232,10 +232,10 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
}
protected _invalidateLine(lineIndex: number): void {
this._lines[lineIndex].isInvalid = true;
this._lines[lineIndex].setIsInvalid(true);
if (lineIndex < this._invalidLineStartIndex) {
if (this._invalidLineStartIndex < this._lines.length) {
this._lines[this._invalidLineStartIndex].isInvalid = true;
this._lines[this._invalidLineStartIndex].setIsInvalid(true);
}
this._invalidLineStartIndex = lineIndex;
this._beginBackgroundTokenization();
......@@ -353,14 +353,14 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
}
this._lines[lineIndex].setTokens(this._languageIdentifier.id, r.tokens);
eventBuilder.registerChangedTokens(lineIndex + 1);
this._lines[lineIndex].isInvalid = false;
this._lines[lineIndex].setIsInvalid(false);
if (endStateIndex < linesLength) {
if (this._lines[endStateIndex].getState() !== null && r.endState.equals(this._lines[endStateIndex].getState())) {
// The end state of this line remains the same
let nextInvalidLineIndex = lineIndex + 1;
while (nextInvalidLineIndex < linesLength) {
if (this._lines[nextInvalidLineIndex].isInvalid) {
if (this._lines[nextInvalidLineIndex].isInvalid()) {
break;
}
if (nextInvalidLineIndex + 1 < linesLength) {
......
......@@ -186,7 +186,7 @@ suite('Editor Model - Model Modes 2', () => {
function invalidEqual(model: Model, expected: number[]): void {
let actual: number[] = [];
for (let i = 0, len = model.getLineCount(); i < len; i++) {
if (model._lines[i].isInvalid) {
if (model._lines[i].isInvalid()) {
actual.push(i);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册