mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-13 19:48:37 -05:00
Vscode merge (#4582)
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd * fix issues with merges * bump node version in azpipe * replace license headers * remove duplicate launch task * fix build errors * fix build errors * fix tslint issues * working through package and linux build issues * more work * wip * fix packaged builds * working through linux build errors * wip * wip * wip * fix mac and linux file limits * iterate linux pipeline * disable editor typing * revert series to parallel * remove optimize vscode from linux * fix linting issues * revert testing change * add work round for new node * readd packaging for extensions * fix issue with angular not resolving decorator dependencies
This commit is contained in:
@@ -149,7 +149,7 @@ const enum IndentGuideRepeatOption {
|
||||
|
||||
export class SplitLinesCollection implements IViewModelLinesCollection {
|
||||
|
||||
private model: ITextModel;
|
||||
private readonly model: ITextModel;
|
||||
private _validModelVersionId: number;
|
||||
|
||||
private wrappingColumn: number;
|
||||
@@ -160,7 +160,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
|
||||
|
||||
private prefixSumComputer: PrefixSumComputerWithCache;
|
||||
|
||||
private linePositionMapperFactory: ILineMapperFactory;
|
||||
private readonly linePositionMapperFactory: ILineMapperFactory;
|
||||
|
||||
private hiddenAreasIds: string[];
|
||||
|
||||
@@ -1001,11 +1001,11 @@ class InvisibleIdentitySplitLine implements ISplitLine {
|
||||
|
||||
export class SplitLine implements ISplitLine {
|
||||
|
||||
private positionMapper: ILineMapping;
|
||||
private outputLineCount: number;
|
||||
private readonly positionMapper: ILineMapping;
|
||||
private readonly outputLineCount: number;
|
||||
|
||||
private wrappedIndent: string;
|
||||
private wrappedIndentLength: number;
|
||||
private readonly wrappedIndent: string;
|
||||
private readonly wrappedIndentLength: number;
|
||||
private _isVisible: boolean;
|
||||
|
||||
constructor(positionMapper: ILineMapping, isVisible: boolean) {
|
||||
|
||||
Reference in New Issue
Block a user