ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 09:42:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.26.1 (#2394)

Browse Source 
* Squash merge commits for 1.26 (#1) (#2323)

* Polish tag search as per feedback (#55269)

* Polish tag search as per feedback

* Updated regex

* Allow users to opt-out of features that send online requests in the background (#55097)

* settings sweep #54690

* Minor css tweaks to enable eoverflow elipsis in more places (#55277)

* fix an issue with titlebarheight when not scaling with zoom

* Settings descriptions update #54690

* fixes #55209

* Settings editor - many padding fixes

* More space above level 2 label

* Fixing Cannot debug npm script using Yarn #55103

* Settings editor - show ellipsis when description overflows

* Settings editor - ... fix measuring around links, relayout

* Setting descriptions

* Settings editor - fix ... for some short lines, fix select container width

* Settings editor - overlay trees so scrollable shadow is full width

* Fix #54133 - missing extension settings after reload

* Settings color token description tweak

* Settings editor - disable overflow indicator temporarily, needs to be faster

* Added command to Run the selected npm script

* fixes #54452

* fixes #54929

* fixes #55248

* prefix command with extension name

* Contribute run selected to the context menu

* node-debug@1.26.6

* Allow terminal rendererType to be swapped out at runtime

Part of #53274
Fixes #55344

* Settings editor - fix not focusing search when restoring editor
setInput must be actually async. Will be fixed naturally when we aren't using winJS promises...

* Settings editor - TOC should only expand the section with a selected item

* Bump node-debug2

* Settings editor - Tree focus outlines

* Settings editor - don't blink the scrollbar when toc selection changes
And hide TOC correctly when the editor is narrow

* Settings editor - header rows should not be selectable

* fixes #54877

* change debug assignee to isi

* Settings sweep (#54690)

* workaround for #55051

* Settings sweep (#54690)

* settings sweep

#54690

* Don't try closing tags when you type > after another >

* Describe what implementation code lens does

Fixes #55370

* fix javadoc formatter setting description

* fixes #55325

* update to officical TS version

* Settings editor - Even more padding, use semibold instead of bold

* Fix #55357 - fix TOC twistie

* fixes #55288

* explorer: refresh on di change file system provider registration

fixes #53256

* Disable push to Linux repo to test standalone publisher

* New env var to notify log level to extensions #54001

* Disable snippets in extension search (when not in suggest dropdown) (#55281)

* Disable snippits in extension search (when not in suggest dropdown)

* Add monaco input contributions

* Fix bug preventing snippetSuggestions from taking effect in sub-editors

* Latest emmet helper to fix #52366

* Fix comment updates for threads within same file

* Allow extensions to log telemetry to log files #54001

* Pull latest css grammar

* files.exclude control - use same style for "add" vs "edit"

* files.exclude control - focus/keyboard behavior

* don't show menubar too early

* files.exclude - better styling

* Place cursor at end of extensions search box on autofill (#55254)

* Place cursor at end of extensions search box on autofill

* Use position instead of selection

* fix linux build issue (empty if block)

* Settings editor - fix extension category prefixes

* Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO

* File/Text search provider docs

* Fixes #52655

* Include epoch (#55008)

* Fixes #53385

* Fixes #49480

*  VS Code Insiders (Users) not opening Fixes #55353

* Better handling of the case when the extension host fails to start

* Fixes #53966

*  Remove confusing Start from wordPartLeft commands ID

* vscode-xterm@3.6.0-beta12

Fixes #55488

* Initial size is set to infinity!! Fixes #55461

* Polish embeddedEditorBackground

* configuration service misses event

* Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query

* Select all not working in issue reporter on mac, fixes #55424

* Disable fuzzy matching for extensions autosuggest (#55498)

* Fix clipping of extensions search border in some third party themes (#55504)

* fixes #55538

* Fix bug causing an aria alert to not be shown the third time
 (and odd numbers thereafter)

* Settings editor - work around rendering glitch with webkit-line-clamp

* Settings editor - revert earlier '...' changes

* Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason

* Settings editor - better overflow indicator

* Don't show existing filters in autocomplete (#55495)

* Dont show existing filters in autocomplete

* Simplify

* Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543)

* fixes #55223

* Update vscode-css-languageservice to 3.0.10-next.1

* Fix #55509 - settings navigation

* Fix #55519

* Fix #55520

* FIx #55524

* Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly

* oss updates for endgame

* Fix unit tests

* fixes #55522

* Avoid missing manifest error from bubbling up #54757

* Settings format crawl

* Search provider - Fix FileSearchProvider to return array, not progress

* Fix #55598

* Settings editor - fix NPE rendering settings with no description

* dont render inden guides in search box (#55600)

* fixes #55454

* More settings crawl

* Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex

* Fix FileSearchProvider unit tests for progress change

* fixes #55561

* Settings description update for #54690

* Update setting descriptions for online services

* Minor edits

* fixes #55513

* fixes #55451

* Fix #55612 - fix findTextInFiles cancellation

* fixes #55539

* More setting description tweaks

* Setting to disable online experiments #54354

* fixes #55507

* fixes #55515

* Show online services action only in Insiders for now

* Settings editor - change toc behavior default to 'filter'

* Settings editor - nicer filter count style during search

* Fix #55617 - search viewlet icons

* Settings editor - better styling for element count indicator

* SearchProvider - fix NPE when searching extraFileResources

* Allow extends to work without json suffix

Fixes #16905

* Remove accessability options logic entirely

Follow up on #55451

* use latest version of DAP

* fixes #55490

* fixes #55122

* fixes #52332

* Avoid assumptions about git: URIs (fixes #36236)

* relative path for descriptions

* resourece: get rid of isFile context key

fixes #48275

* Register previous ids for compatibility (#53497)

* more tuning for #48275

* no need to always re-read "files explorer"

fixes #52003

* read out active composites properly

fixes #51967

* Update link colors for hc theme to meet color contrast ratio, fixes #55651

Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated

* detect 'winpty-agent.exe'; fixes #55672

* node-debug@1.26.7

* reset counter on new label

* Settings editor - fix multiple setting links in one description

* Settings editor - color code blocks in setting descriptions, fix #55532

* Settings editor - hover color in TOC

* Settings editor - fix navigation NPE

* Settings editor - fix text control width

* Settings editor - maybe fix #55684

* Fix bug causing cursor to not move on paste

* fixes #53582

* Use ctrlCmd instead of ctrl for go down from search box

* fixes #55264

* fixes #55456

* filter for spcaes before triggering search (#55611)

* Fix #55698 - don't lose filtered TOC counts when refreshing TOC

* fixes #55421

* fixes #28979

* fixes #55576

* only add check for updates to windows/linux help

* readonly files: append decoration to label

fixes #53022

* debug: do not show toolbar while initialising

fixes #55026

* Opening launch.json should not activate debug extensions

fixes #55029

* fixes #55435

* fixes #55434

* fixes #55439

* trigger menu only on altkey up

* Fix #50555 - fix settings editor memory leak

* Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render

* fixes #55335

* proper fix for readonly model

fixes #53022

* improve FoldingRangeKind spec (for #55686)

* Use class with static fields (fixes #55494)

* Fixes #53671

* fixes #54630

* [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324

* cleanup deps

* debug issues back to andre

* update electron for smoketest

* Fix #55757 - prevent settings tabs from overflowing

* Fix #53897 - revert setting menu defaults to old editor

* Add enum descriptions to `typescript.preferences.importModuleSpecifier`

* Fix #55767 - leaking style elements from settings editor

* Fix #55521 - prevent flashing when clicking in exclude control

* Update Git modified color for contrast ratio, fixes #53140

* Revert "Merge branch 'master' of github.com:Microsoft/vscode"

This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing
changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917.

* Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode""

This reverts commit 53949d963f39e40757557c6526332354a31d9154.

* don't ask to install an incomplete menu

* Fix NPE in terminal AccessibilityManager

Fixes #55744

* don't display fallback menu unless we've closed the last window

* fixes #55547

* Fix smoke tests for extension search box

* Update OSSREADME.json for Electron 2.0.5

* Update distro

Includes Chromium license changes

* fix #55455

* fix #55865

* fixes #55893

* Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805)

* Fix bug causing workspace recommendations to go away upon ignoring a recommendation

* ONly show on @recommended or @recommended:workspace

* Make more consistant

* Fix #55911

* Understand json activity (#55926)

* Understand json file activity

* Refactoring

* adding composer.json

* Distro update for experiments

* use terminal.processId for auto-attach; fixes #55918

* Reject invalid URI with vscode.openFolder (for #55891)

* improve win32 setup system vs user detection

fixes #55840

fixes #55840

delay winreg import

related to #55840

show notification earlier

related to #55840

fix #55840

update inno setup message

related to #55840

* Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead

* Bring back the old menu due to electron 2.0 issues (#55913)

* add the old menu back for native menus

* make menu labels match

* `vscode.openFolder`: treat missing URI schema gracefully (for #55891)

* delay EH reattach; fixes #55955

* Mark all json files under appSettingsHome as settings

* Use localized strings for telemetry opt-out

* Exception when saving file editor opened from remote file provider (fixes #55051)

* Remove terminal menu from stable

Fixes 56003

* VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933

* improve fix for #55891

* fix #55916

* Improve #55891

* increase EH debugging restart delay; fixes #55955

* Revert "Don't include non-resource entries in history quick pick"

This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060.

* Diff editor: horizontal scrollbar height is smaller (fixes #56062)

* improve openFolder uri fix (correctly treat backslashes)

* fixes #56116
repair ipc for native menubar keybindings

* Fix #56240 - Open the JSON settings editor instead of the UI editor

* Fix #55536

* uriDisplay: if no formatter is registered fall back to getPathlabel

fixes #56104

* VSCode hangs when opening python file. Fixes #56377

* VS Code Hangs When Opening Specific PowerShell File. Fixes #56430

* Fix #56433 - search extraFileResources even when no folders open

* Workaround #55649

* Fix in master #56371

* Fix tests #56371

* Fix in master #56317

* increase version to 1.26.1

* Fixes #56387: Handle SIGPIPE in extension host

* fixes #56185

* Fix merge issues (part 1)

* Fix build breaks (part 1)

* Build breaks (part 2)

* Build breaks (part 3)

* More build breaks (part 4)

* Fix build breaks (part 5)

* WIP

* Fix menus

* Render query result and message panels (#2363)

* Put back query editor hot exit changes

* Fix grid changes that broke profiler (#2365)

* Update APIs for saving query editor state

* Fix restore view state for profiler and edit data

* Updating custom default themes to support 4.5:1 contrast ratio

* Test updates

* Fix Extension Manager and Windows Setup

* Update license headers

* Add appveyor and travis files back

* Fix hidden modal dropdown issue
This commit is contained in:
Karl Burtram
2018-09-04 14:55:00 -07:00
committed by GitHub
parent 3763278366
commit 81329fa7fa
2638 changed files with 118456 additions and 64012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/vs/editor/test/common/config/commonEditorConfig.test.ts
View File

@@ -9,12 +9,13 @@ import { EditorZoom } from 'vs/editor/common/config/editorZoom';
import { TestConfiguration } from 'vs/editor/test/common/mocks/testConfiguration';
import { IEnvConfiguration } from 'vs/editor/common/config/commonEditorConfig';
import { AccessibilitySupport } from 'vs/base/common/platform';
import { IEditorHoverOptions } from 'vs/editor/common/config/editorOptions';
suite('Common Editor Config', () => {
test('Zoom Level', () => {
//Zoom levels are defined to go between -9, 9 inclusive
var zoom = EditorZoom;
//Zoom levels are defined to go between -5, 20 inclusive
const zoom = EditorZoom;
zoom.setZoomLevel(0);
assert.equal(zoom.getZoomLevel(), 0);
@@ -32,25 +33,25 @@ suite('Common Editor Config', () => {
assert.equal(zoom.getZoomLevel(), 9);
zoom.setZoomLevel(-9);
assert.equal(zoom.getZoomLevel(), -9);
assert.equal(zoom.getZoomLevel(), -5);
zoom.setZoomLevel(10);
assert.equal(zoom.getZoomLevel(), 9);
zoom.setZoomLevel(20);
assert.equal(zoom.getZoomLevel(), 20);
zoom.setZoomLevel(-10);
assert.equal(zoom.getZoomLevel(), -9);
assert.equal(zoom.getZoomLevel(), -5);
zoom.setZoomLevel(9.1);
assert.equal(zoom.getZoomLevel(), 9);
assert.equal(zoom.getZoomLevel(), 9.1);
zoom.setZoomLevel(-9.1);
assert.equal(zoom.getZoomLevel(), -9);
assert.equal(zoom.getZoomLevel(), -5);
zoom.setZoomLevel(Infinity);
assert.equal(zoom.getZoomLevel(), 9);
assert.equal(zoom.getZoomLevel(), 20);
zoom.setZoomLevel(Number.NEGATIVE_INFINITY);
assert.equal(zoom.getZoomLevel(), -9);
assert.equal(zoom.getZoomLevel(), -5);
});
class TestWrappingConfiguration extends TestConfiguration {
@@ -179,4 +180,17 @@ suite('Common Editor Config', () => {
});
assertWrapping(config, true, 1);
});
test('issue #53152: Cannot assign to read only property \'enabled\' of object', () => {
let hoverOptions: IEditorHoverOptions = {};
Object.defineProperty(hoverOptions, 'enabled', {
writable: false,
value: true
});
let config = new TestConfiguration({ hover: hoverOptions });
assert.equal(config.editor.contribInfo.hover.enabled, true);
config.updateOptions({ hover: { enabled: false } });
assert.equal(config.editor.contribInfo.hover.enabled, false);
});
});

22
src/vs/editor/test/common/core/range.test.ts
View File

@@ -10,7 +10,7 @@ import { Position } from 'vs/editor/common/core/position';
suite('Editor Core - Range', () => {
test('empty range', () => {
var s = new Range(1, 1, 1, 1);
let s = new Range(1, 1, 1, 1);
assert.equal(s.startLineNumber, 1);
assert.equal(s.startColumn, 1);
assert.equal(s.endLineNumber, 1);
@@ -19,7 +19,7 @@ suite('Editor Core - Range', () => {
});
test('swap start and stop same line', () => {
var s = new Range(1, 2, 1, 1);
let s = new Range(1, 2, 1, 1);
assert.equal(s.startLineNumber, 1);
assert.equal(s.startColumn, 1);
assert.equal(s.endLineNumber, 1);
@@ -28,7 +28,7 @@ suite('Editor Core - Range', () => {
});
test('swap start and stop', () => {
var s = new Range(2, 1, 1, 2);
let s = new Range(2, 1, 1, 2);
assert.equal(s.startLineNumber, 1);
assert.equal(s.startColumn, 2);
assert.equal(s.endLineNumber, 2);
@@ -37,7 +37,7 @@ suite('Editor Core - Range', () => {
});
test('no swap same line', () => {
var s = new Range(1, 1, 1, 2);
let s = new Range(1, 1, 1, 2);
assert.equal(s.startLineNumber, 1);
assert.equal(s.startColumn, 1);
assert.equal(s.endLineNumber, 1);
@@ -46,7 +46,7 @@ suite('Editor Core - Range', () => {
});
test('no swap', () => {
var s = new Range(1, 1, 2, 1);
let s = new Range(1, 1, 2, 1);
assert.equal(s.startLineNumber, 1);
assert.equal(s.startColumn, 1);
assert.equal(s.endLineNumber, 2);
@@ -55,7 +55,7 @@ suite('Editor Core - Range', () => {
});
test('compareRangesUsingEnds', () => {
var a, b;
let a: Range, b: Range;
a = new Range(1, 1, 1, 3);
b = new Range(1, 2, 1, 4);
@@ -117,4 +117,14 @@ suite('Editor Core - Range', () => {
assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(2, 3, 5, 9)), true);
assert.equal(new Range(2, 2, 5, 10).containsRange(new Range(3, 100, 4, 100)), true);
});
test('areIntersecting', () => {
assert.equal(Range.areIntersecting(new Range(2, 2, 3, 2), new Range(4, 2, 5, 2)), false);
assert.equal(Range.areIntersecting(new Range(4, 2, 5, 2), new Range(2, 2, 3, 2)), false);
assert.equal(Range.areIntersecting(new Range(4, 2, 5, 2), new Range(5, 2, 6, 2)), false);
assert.equal(Range.areIntersecting(new Range(5, 2, 6, 2), new Range(4, 2, 5, 2)), false);
assert.equal(Range.areIntersecting(new Range(2, 2, 2, 7), new Range(2, 4, 2, 6)), true);
assert.equal(Range.areIntersecting(new Range(2, 2, 2, 7), new Range(2, 4, 2, 9)), true);
assert.equal(Range.areIntersecting(new Range(2, 4, 2, 9), new Range(2, 2, 2, 7)), true);
});
});

327
src/vs/editor/test/common/diff/diffComputer.test.ts
View File

@@ -9,8 +9,8 @@ import { DiffComputer } from 'vs/editor/common/diff/diffComputer';
import { IChange, ICharChange, ILineChange } from 'vs/editor/common/editorCommon';
function extractCharChangeRepresentation(change: ICharChange, expectedChange: ICharChange): ICharChange {
var hasOriginal = expectedChange && expectedChange.originalStartLineNumber > 0;
var hasModified = expectedChange && expectedChange.modifiedStartLineNumber > 0;
let hasOriginal = expectedChange && expectedChange.originalStartLineNumber > 0;
let hasModified = expectedChange && expectedChange.modifiedStartLineNumber > 0;
return {
originalStartLineNumber: hasOriginal ? change.originalStartLineNumber : 0,
originalStartColumn: hasOriginal ? change.originalStartColumn : 0,
@@ -25,8 +25,9 @@ function extractCharChangeRepresentation(change: ICharChange, expectedChange: IC
}
function extractLineChangeRepresentation(change: ILineChange, expectedChange: ILineChange): IChange | ILineChange {
let charChanges: ICharChange[];
if (change.charChanges) {
let charChanges: ICharChange[] = [];
charChanges = [];
for (let i = 0; i < change.charChanges.length; i++) {
charChanges.push(
extractCharChangeRepresentation(
@@ -35,56 +36,53 @@ function extractLineChangeRepresentation(change: ILineChange, expectedChange: IL
)
);
}
return {
originalStartLineNumber: change.originalStartLineNumber,
originalEndLineNumber: change.originalEndLineNumber,
modifiedStartLineNumber: change.modifiedStartLineNumber,
modifiedEndLineNumber: change.modifiedEndLineNumber,
charChanges: charChanges
};
}
return {
originalStartLineNumber: change.originalStartLineNumber,
originalEndLineNumber: change.originalEndLineNumber,
modifiedStartLineNumber: change.modifiedStartLineNumber,
modifiedEndLineNumber: change.modifiedEndLineNumber
modifiedEndLineNumber: change.modifiedEndLineNumber,
charChanges: charChanges
};
}
function assertDiff(originalLines: string[], modifiedLines: string[], expectedChanges: IChange[], shouldPostProcessCharChanges: boolean = false, shouldIgnoreTrimWhitespace: boolean = false) {
var diffComputer = new DiffComputer(originalLines, modifiedLines, {
shouldPostProcessCharChanges: shouldPostProcessCharChanges || false,
shouldIgnoreTrimWhitespace: shouldIgnoreTrimWhitespace || false,
function assertDiff(originalLines: string[], modifiedLines: string[], expectedChanges: IChange[], shouldComputeCharChanges: boolean = true, shouldPostProcessCharChanges: boolean = false, shouldIgnoreTrimWhitespace: boolean = false) {
let diffComputer = new DiffComputer(originalLines, modifiedLines, {
shouldComputeCharChanges,
shouldPostProcessCharChanges,
shouldIgnoreTrimWhitespace,
shouldMakePrettyDiff: true
});
var changes = diffComputer.computeDiff();
let changes = diffComputer.computeDiff();
var extracted = [];
for (var i = 0; i < changes.length; i++) {
let extracted = [];
for (let i = 0; i < changes.length; i++) {
extracted.push(extractLineChangeRepresentation(changes[i], <ILineChange>(i < expectedChanges.length ? expectedChanges[i] : null)));
}
assert.deepEqual(extracted, expectedChanges);
}
function createLineDeletion(startLineNumber: number, endLineNumber: number, modifiedLineNumber: number): IChange {
function createLineDeletion(startLineNumber: number, endLineNumber: number, modifiedLineNumber: number): ILineChange {
return {
originalStartLineNumber: startLineNumber,
originalEndLineNumber: endLineNumber,
modifiedStartLineNumber: modifiedLineNumber,
modifiedEndLineNumber: 0
modifiedEndLineNumber: 0,
charChanges: undefined
};
}
function createLineInsertion(startLineNumber: number, endLineNumber: number, originalLineNumber: number): IChange {
function createLineInsertion(startLineNumber: number, endLineNumber: number, originalLineNumber: number): ILineChange {
return {
originalStartLineNumber: originalLineNumber,
originalEndLineNumber: 0,
modifiedStartLineNumber: startLineNumber,
modifiedEndLineNumber: endLineNumber
modifiedEndLineNumber: endLineNumber,
charChanges: undefined
};
}
function createLineChange(originalStartLineNumber: number, originalEndLineNumber: number, modifiedStartLineNumber: number, modifiedEndLineNumber: number, charChanges: ICharChange[]): ILineChange {
function createLineChange(originalStartLineNumber: number, originalEndLineNumber: number, modifiedStartLineNumber: number, modifiedEndLineNumber: number, charChanges?: ICharChange[]): ILineChange {
return {
originalStartLineNumber: originalStartLineNumber,
originalEndLineNumber: originalEndLineNumber,
@@ -141,111 +139,111 @@ suite('Editor Diff - DiffComputer', () => {
// ---- insertions
test('one inserted line below', () => {
var original = ['line'];
var modified = ['line', 'new line'];
var expected = [createLineInsertion(2, 2, 1)];
let original = ['line'];
let modified = ['line', 'new line'];
let expected = [createLineInsertion(2, 2, 1)];
assertDiff(original, modified, expected);
});
test('two inserted lines below', () => {
var original = ['line'];
var modified = ['line', 'new line', 'another new line'];
var expected = [createLineInsertion(2, 3, 1)];
let original = ['line'];
let modified = ['line', 'new line', 'another new line'];
let expected = [createLineInsertion(2, 3, 1)];
assertDiff(original, modified, expected);
});
test('one inserted line above', () => {
var original = ['line'];
var modified = ['new line', 'line'];
var expected = [createLineInsertion(1, 1, 0)];
let original = ['line'];
let modified = ['new line', 'line'];
let expected = [createLineInsertion(1, 1, 0)];
assertDiff(original, modified, expected);
});
test('two inserted lines above', () => {
var original = ['line'];
var modified = ['new line', 'another new line', 'line'];
var expected = [createLineInsertion(1, 2, 0)];
let original = ['line'];
let modified = ['new line', 'another new line', 'line'];
let expected = [createLineInsertion(1, 2, 0)];
assertDiff(original, modified, expected);
});
test('one inserted line in middle', () => {
var original = ['line1', 'line2', 'line3', 'line4'];
var modified = ['line1', 'line2', 'new line', 'line3', 'line4'];
var expected = [createLineInsertion(3, 3, 2)];
let original = ['line1', 'line2', 'line3', 'line4'];
let modified = ['line1', 'line2', 'new line', 'line3', 'line4'];
let expected = [createLineInsertion(3, 3, 2)];
assertDiff(original, modified, expected);
});
test('two inserted lines in middle', () => {
var original = ['line1', 'line2', 'line3', 'line4'];
var modified = ['line1', 'line2', 'new line', 'another new line', 'line3', 'line4'];
var expected = [createLineInsertion(3, 4, 2)];
let original = ['line1', 'line2', 'line3', 'line4'];
let modified = ['line1', 'line2', 'new line', 'another new line', 'line3', 'line4'];
let expected = [createLineInsertion(3, 4, 2)];
assertDiff(original, modified, expected);
});
test('two inserted lines in middle interrupted', () => {
var original = ['line1', 'line2', 'line3', 'line4'];
var modified = ['line1', 'line2', 'new line', 'line3', 'another new line', 'line4'];
var expected = [createLineInsertion(3, 3, 2), createLineInsertion(5, 5, 3)];
let original = ['line1', 'line2', 'line3', 'line4'];
let modified = ['line1', 'line2', 'new line', 'line3', 'another new line', 'line4'];
let expected = [createLineInsertion(3, 3, 2), createLineInsertion(5, 5, 3)];
assertDiff(original, modified, expected);
});
// ---- deletions
test('one deleted line below', () => {
var original = ['line', 'new line'];
var modified = ['line'];
var expected = [createLineDeletion(2, 2, 1)];
let original = ['line', 'new line'];
let modified = ['line'];
let expected = [createLineDeletion(2, 2, 1)];
assertDiff(original, modified, expected);
});
test('two deleted lines below', () => {
var original = ['line', 'new line', 'another new line'];
var modified = ['line'];
var expected = [createLineDeletion(2, 3, 1)];
let original = ['line', 'new line', 'another new line'];
let modified = ['line'];
let expected = [createLineDeletion(2, 3, 1)];
assertDiff(original, modified, expected);
});
test('one deleted lines above', () => {
var original = ['new line', 'line'];
var modified = ['line'];
var expected = [createLineDeletion(1, 1, 0)];
let original = ['new line', 'line'];
let modified = ['line'];
let expected = [createLineDeletion(1, 1, 0)];
assertDiff(original, modified, expected);
});
test('two deleted lines above', () => {
var original = ['new line', 'another new line', 'line'];
var modified = ['line'];
var expected = [createLineDeletion(1, 2, 0)];
let original = ['new line', 'another new line', 'line'];
let modified = ['line'];
let expected = [createLineDeletion(1, 2, 0)];
assertDiff(original, modified, expected);
});
test('one deleted line in middle', () => {
var original = ['line1', 'line2', 'new line', 'line3', 'line4'];
var modified = ['line1', 'line2', 'line3', 'line4'];
var expected = [createLineDeletion(3, 3, 2)];
let original = ['line1', 'line2', 'new line', 'line3', 'line4'];
let modified = ['line1', 'line2', 'line3', 'line4'];
let expected = [createLineDeletion(3, 3, 2)];
assertDiff(original, modified, expected);
});
test('two deleted lines in middle', () => {
var original = ['line1', 'line2', 'new line', 'another new line', 'line3', 'line4'];
var modified = ['line1', 'line2', 'line3', 'line4'];
var expected = [createLineDeletion(3, 4, 2)];
let original = ['line1', 'line2', 'new line', 'another new line', 'line3', 'line4'];
let modified = ['line1', 'line2', 'line3', 'line4'];
let expected = [createLineDeletion(3, 4, 2)];
assertDiff(original, modified, expected);
});
test('two deleted lines in middle interrupted', () => {
var original = ['line1', 'line2', 'new line', 'line3', 'another new line', 'line4'];
var modified = ['line1', 'line2', 'line3', 'line4'];
var expected = [createLineDeletion(3, 3, 2), createLineDeletion(5, 5, 3)];
let original = ['line1', 'line2', 'new line', 'line3', 'another new line', 'line4'];
let modified = ['line1', 'line2', 'line3', 'line4'];
let expected = [createLineDeletion(3, 3, 2), createLineDeletion(5, 5, 3)];
assertDiff(original, modified, expected);
});
// ---- changes
test('one line changed: chars inserted at the end', () => {
var original = ['line'];
var modified = ['line changed'];
var expected = [
let original = ['line'];
let modified = ['line changed'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharInsertion(1, 5, 1, 13)
])
@@ -254,9 +252,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars inserted at the beginning', () => {
var original = ['line'];
var modified = ['my line'];
var expected = [
let original = ['line'];
let modified = ['my line'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharInsertion(1, 1, 1, 4)
])
@@ -265,9 +263,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars inserted in the middle', () => {
var original = ['abba'];
var modified = ['abzzba'];
var expected = [
let original = ['abba'];
let modified = ['abzzba'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharInsertion(1, 3, 1, 5)
])
@@ -276,9 +274,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars inserted in the middle (two spots)', () => {
var original = ['abba'];
var modified = ['abzzbzza'];
var expected = [
let original = ['abba'];
let modified = ['abzzbzza'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharInsertion(1, 3, 1, 5),
createCharInsertion(1, 6, 1, 8)
@@ -288,9 +286,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars deleted 1', () => {
var original = ['abcdefg'];
var modified = ['abcfg'];
var expected = [
let original = ['abcdefg'];
let modified = ['abcfg'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharDeletion(1, 4, 1, 6)
])
@@ -299,9 +297,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('one line changed: chars deleted 2', () => {
var original = ['abcdefg'];
var modified = ['acfg'];
var expected = [
let original = ['abcdefg'];
let modified = ['acfg'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharDeletion(1, 2, 1, 3),
createCharDeletion(1, 4, 1, 6)
@@ -311,9 +309,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('two lines changed 1', () => {
var original = ['abcd', 'efgh'];
var modified = ['abcz'];
var expected = [
let original = ['abcd', 'efgh'];
let modified = ['abcz'];
let expected = [
createLineChange(1, 2, 1, 1, [
createCharChange(1, 4, 2, 5, 1, 4, 1, 5)
])
@@ -322,9 +320,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('two lines changed 2', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR'];
var modified = ['foo', 'abcz', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR'];
let modified = ['foo', 'abcz', 'BAR'];
let expected = [
createLineChange(2, 3, 2, 2, [
createCharChange(2, 4, 3, 5, 2, 4, 2, 5)
])
@@ -333,9 +331,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('two lines changed 3', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR'];
var modified = ['foo', 'abcz', 'zzzzefgh', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR'];
let modified = ['foo', 'abcz', 'zzzzefgh', 'BAR'];
let expected = [
createLineChange(2, 3, 2, 3, [
createCharChange(2, 4, 2, 5, 2, 4, 3, 5)
])
@@ -344,9 +342,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('three lines changed', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR'];
var modified = ['foo', 'zzzefgh', 'xxx', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR'];
let modified = ['foo', 'zzzefgh', 'xxx', 'BAR'];
let expected = [
createLineChange(2, 3, 2, 3, [
createCharChange(2, 1, 2, 5, 2, 1, 2, 4),
createCharInsertion(3, 1, 3, 4)
@@ -356,9 +354,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('big change part 1', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR'];
var modified = ['hello', 'foo', 'zzzefgh', 'xxx', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR'];
let modified = ['hello', 'foo', 'zzzefgh', 'xxx', 'BAR'];
let expected = [
createLineInsertion(1, 1, 0),
createLineChange(2, 3, 3, 4, [
createCharChange(2, 1, 2, 5, 3, 1, 3, 4),
@@ -369,9 +367,9 @@ suite('Editor Diff - DiffComputer', () => {
});
test('big change part 2', () => {
var original = ['foo', 'abcd', 'efgh', 'BAR', 'RAB'];
var modified = ['hello', 'foo', 'zzzefgh', 'xxx', 'BAR'];
var expected = [
let original = ['foo', 'abcd', 'efgh', 'BAR', 'RAB'];
let modified = ['hello', 'foo', 'zzzefgh', 'xxx', 'BAR'];
let expected = [
createLineInsertion(1, 1, 0),
createLineChange(2, 3, 3, 4, [
createCharChange(2, 1, 2, 5, 3, 1, 3, 4),
@@ -383,84 +381,84 @@ suite('Editor Diff - DiffComputer', () => {
});
test('char change postprocessing merges', () => {
var original = ['abba'];
var modified = ['azzzbzzzbzzza'];
var expected = [
let original = ['abba'];
let modified = ['azzzbzzzbzzza'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharChange(1, 2, 1, 4, 1, 2, 1, 13)
])
];
assertDiff(original, modified, expected, true);
assertDiff(original, modified, expected, true, true);
});
test('ignore trim whitespace', () => {
var original = ['\t\t foo ', 'abcd', 'efgh', '\t\t BAR\t\t'];
var modified = [' hello\t', '\t foo \t', 'zzzefgh', 'xxx', ' BAR \t'];
var expected = [
let original = ['\t\t foo ', 'abcd', 'efgh', '\t\t BAR\t\t'];
let modified = [' hello\t', '\t foo \t', 'zzzefgh', 'xxx', ' BAR \t'];
let expected = [
createLineInsertion(1, 1, 0),
createLineChange(2, 3, 3, 4, [
createCharChange(2, 1, 2, 5, 3, 1, 3, 4),
createCharInsertion(4, 1, 4, 4)
])
];
assertDiff(original, modified, expected, false, true);
assertDiff(original, modified, expected, true, false, true);
});
test('issue #12122 r.hasOwnProperty is not a function', () => {
var original = ['hasOwnProperty'];
var modified = ['hasOwnProperty', 'and another line'];
var expected = [
let original = ['hasOwnProperty'];
let modified = ['hasOwnProperty', 'and another line'];
let expected = [
createLineInsertion(2, 2, 1)
];
assertDiff(original, modified, expected);
});
test('empty diff 1', () => {
var original = [''];
var modified = ['something'];
var expected = [
let original = [''];
let modified = ['something'];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
])
];
assertDiff(original, modified, expected, false, true);
assertDiff(original, modified, expected, true, false, true);
});
test('empty diff 2', () => {
var original = [''];
var modified = ['something', 'something else'];
var expected = [
let original = [''];
let modified = ['something', 'something else'];
let expected = [
createLineChange(1, 1, 1, 2, [
createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
])
];
assertDiff(original, modified, expected, false, true);
assertDiff(original, modified, expected, true, false, true);
});
test('empty diff 3', () => {
var original = ['something', 'something else'];
var modified = [''];
var expected = [
let original = ['something', 'something else'];
let modified = [''];
let expected = [
createLineChange(1, 2, 1, 1, [
createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
])
];
assertDiff(original, modified, expected, false, true);
assertDiff(original, modified, expected, true, false, true);
});
test('empty diff 4', () => {
var original = ['something'];
var modified = [''];
var expected = [
let original = ['something'];
let modified = [''];
let expected = [
createLineChange(1, 1, 1, 1, [
createCharChange(0, 0, 0, 0, 0, 0, 0, 0)
])
];
assertDiff(original, modified, expected, false, true);
assertDiff(original, modified, expected, true, false, true);
});
test('pretty diff 1', () => {
var original = [
let original = [
'suite(function () {',
' test1() {',
' assert.ok(true);',
@@ -472,7 +470,7 @@ suite('Editor Diff - DiffComputer', () => {
'});',
'',
];
var modified = [
let modified = [
'// An insertion',
'suite(function () {',
' test1() {',
@@ -489,15 +487,15 @@ suite('Editor Diff - DiffComputer', () => {
'});',
'',
];
var expected = [
let expected = [
createLineInsertion(1, 1, 0),
createLineInsertion(10, 13, 8)
];
assertDiff(original, modified, expected, false, true);
assertDiff(original, modified, expected, true, false, true);
});
test('pretty diff 2', () => {
var original = [
let original = [
'// Just a comment',
'',
'function compute(a, b, c, d) {',
@@ -515,7 +513,7 @@ suite('Editor Diff - DiffComputer', () => {
' }',
'}',
];
var modified = [
let modified = [
'// Here is an inserted line',
'// and another inserted line',
'// and another one',
@@ -532,15 +530,15 @@ suite('Editor Diff - DiffComputer', () => {
' }',
'}',
];
var expected = [
let expected = [
createLineInsertion(1, 3, 0),
createLineDeletion(10, 13, 12),
];
assertDiff(original, modified, expected, false, true);
assertDiff(original, modified, expected, true, false, true);
});
test('pretty diff 3', () => {
var original = [
let original = [
'class A {',
' /**',
' * m1',
@@ -553,7 +551,7 @@ suite('Editor Diff - DiffComputer', () => {
' method3() {}',
'}',
];
var modified = [
let modified = [
'class A {',
' /**',
' * m1',
@@ -571,10 +569,10 @@ suite('Editor Diff - DiffComputer', () => {
' method3() {}',
'}',
];
var expected = [
let expected = [
createLineInsertion(7, 11, 6)
];
assertDiff(original, modified, expected, false, true);
assertDiff(original, modified, expected, true, false, true);
});
test('issue #23636', () => {
@@ -636,7 +634,7 @@ suite('Editor Diff - DiffComputer', () => {
' }',
' }',
];
var expected = [
let expected = [
createLineChange(
1, 27, 1, 27,
[
@@ -671,7 +669,7 @@ suite('Editor Diff - DiffComputer', () => {
)
// createLineInsertion(7, 11, 6)
];
assertDiff(original, modified, expected, true, false);
assertDiff(original, modified, expected, true, true, false);
});
test('issue #43922', () => {
@@ -679,9 +677,9 @@ suite('Editor Diff - DiffComputer', () => {
' * `yarn [install]` -- Install project NPM dependencies. This is automatically done when you first create the project. You should only need to run this if you add dependencies in `package.json`.',
];
let modified = [
' * `yarn` -- Install project NPM dependencies. You should only need to run this if you add dependencies in `package.json`.',
' * `yarn` -- Install project NPM dependencies. You should only need to run this if you add dependencies in `package.json`.',
];
var expected = [
let expected = [
createLineChange(
1, 1, 1, 1,
[
@@ -690,6 +688,45 @@ suite('Editor Diff - DiffComputer', () => {
]
)
];
assertDiff(original, modified, expected, true, false);
assertDiff(original, modified, expected, true, true, false);
});
test('issue #42751', () => {
let original = [
' 1',
' 2',
];
let modified = [
' 1',
' 3',
];
let expected = [
createLineChange(
2, 2, 2, 2,
[
createCharChange(2, 3, 2, 4, 2, 3, 2, 5)
]
)
];
assertDiff(original, modified, expected, true, true, false);
});
test('does not give character changes', () => {
let original = [
' 1',
' 2',
'A',
];
let modified = [
' 1',
' 3',
' A',
];
let expected = [
createLineChange(
2, 3, 2, 3
)
];
assertDiff(original, modified, expected, false, false, false);
});
});

2
src/vs/editor/test/common/editorTestUtils.ts
View File

@@ -10,7 +10,7 @@ import { LanguageIdentifier } from 'vs/editor/common/modes';
import URI from 'vs/base/common/uri';
export function withEditorModel(text: string[], callback: (model: TextModel) => void): void {
var model = TextModel.createFromString(text.join('\n'));
let model = TextModel.createFromString(text.join('\n'));
callback(model);
model.dispose();
}

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

@@ -9,9 +9,9 @@ import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeText
export function doBenchmark<T>(id: string, ts: T[], fn: (t: T) => void) {
let columns: string[] = [id];
for (let i = 0; i < ts.length; i++) {
var start = process.hrtime();
let start = process.hrtime();
fn(ts[i]);
var diff = process.hrtime(start);
let diff = process.hrtime(start);
columns.push(`${(diff[0] * 1000 + diff[1] / 1000000).toFixed(3)} ms`);
}
console.log('|' + columns.join('\t|') + '|');
@@ -61,9 +61,9 @@ export class BenchmarkSuite {
let factory = benchmark.buildBuffer(builder);
let buffer = factory.create(DefaultEndOfLine.LF);
benchmark.preCycle(buffer);
var start = process.hrtime();
let start = process.hrtime();
benchmark.fn(buffer);
var diff = process.hrtime(start);
let diff = process.hrtime(start);
timeDiffTotal += (diff[0] * 1000 * 1000 + diff[1] / 1000);
}
columns.push(`${(timeDiffTotal / 1000 / this.iterations).toFixed(3)} ms`);

2
src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts
View File

@@ -10,7 +10,7 @@ import { generateRandomChunkWithLF } from 'vs/editor/test/common/model/linesText
import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtils';
let pieceTreeTextBufferBuilder = new PieceTreeTextBufferBuilder();
let chunks = [];
let chunks: string[] = [];
for (let i = 0; i < 100; i++) {
chunks.push(generateRandomChunkWithLF(16 * 1000, 64 * 1000));

6
src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
View File

@@ -21,7 +21,7 @@ let editTypes = [
];
for (let fileSize of fileSizes) {
let chunks = [];
let chunks: string[] = [];
let chunkCnt = Math.floor(fileSize / (64 * 1000));
if (chunkCnt === 0) {
@@ -73,7 +73,7 @@ for (let fileSize of fileSizes) {
},
fn: (textBuffer) => {
for (let j = 0, len = textBuffer.getLineCount(); j < len; j++) {
var str = textBuffer.getLineContent(j + 1);
let str = textBuffer.getLineContent(j + 1);
let firstChar = str.charCodeAt(0);
let lastChar = str.charCodeAt(str.length - 1);
firstChar = firstChar - lastChar;
@@ -102,7 +102,7 @@ for (let fileSize of fileSizes) {
let startLine = getRandomInt(minLine, Math.max(minLine, maxLine - 100));
let endLine = Math.min(maxLine, startLine + 100);
for (let j = startLine; j < endLine; j++) {
var str = textBuffer.getLineContent(j + 1);
let str = textBuffer.getLineContent(j + 1);
let firstChar = str.charCodeAt(0);
let lastChar = str.charCodeAt(str.length - 1);
firstChar = firstChar - lastChar;

2
src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
View File

@@ -11,7 +11,7 @@ import { BenchmarkSuite } from 'vs/editor/test/common/model/benchmark/benchmarkU
let fileSizes = [1, 1000, 64 * 1000, 32 * 1000 * 1000];
for (let fileSize of fileSizes) {
let chunks = [];
let chunks: string[] = [];
let chunkCnt = Math.floor(fileSize / (64 * 1000));
if (chunkCnt === 0) {

4
src/vs/editor/test/common/model/editableTextModel.test.ts
View File

@@ -998,7 +998,7 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
assertMirrorModels();
}, (model) => {
var isFirstTime = true;
let isFirstTime = true;
model.onDidChangeRawContent(() => {
if (!isFirstTime) {
return;
@@ -1026,7 +1026,7 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
assertMirrorModels();
}, (model) => {
var isFirstTime = true;
let isFirstTime = true;
model.onDidChangeContent((e: IModelContentChangedEvent) => {
if (!isFirstTime) {
return;

16
src/vs/editor/test/common/model/editableTextModelTestUtils.ts
View File

@@ -12,12 +12,12 @@ import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvent
import { EndOfLinePreference, IIdentifiedSingleEditOperation, EndOfLineSequence } from 'vs/editor/common/model';
export function testApplyEditsWithSyncedModels(original: string[], edits: IIdentifiedSingleEditOperation[], expected: string[], inputEditsAreInvalid: boolean = false): void {
var originalStr = original.join('\n');
var expectedStr = expected.join('\n');
let originalStr = original.join('\n');
let expectedStr = expected.join('\n');
assertSyncedModels(originalStr, (model, assertMirrorModels) => {
// Apply edits & collect inverse edits
var inverseEdits = model.applyEdits(edits);
let inverseEdits = model.applyEdits(edits);
// Assert edits produced expected result
assert.deepEqual(model.getValue(EndOfLinePreference.LF), expectedStr);
@@ -25,7 +25,7 @@ export function testApplyEditsWithSyncedModels(original: string[], edits: IIdent
assertMirrorModels();
// Apply the inverse edits
var inverseInverseEdits = model.applyEdits(inverseEdits);
let inverseInverseEdits = model.applyEdits(inverseEdits);
// Assert the inverse edits brought back model to original state
assert.deepEqual(model.getValue(EndOfLinePreference.LF), originalStr);
@@ -89,7 +89,7 @@ function assertLineMapping(model: TextModel, msg: string): void {
export function assertSyncedModels(text: string, callback: (model: TextModel, assertMirrorModels: () => void) => void, setup: (model: TextModel) => void = null): void {
var model = new TextModel(text, TextModel.DEFAULT_CREATION_OPTIONS, null);
let model = new TextModel(text, TextModel.DEFAULT_CREATION_OPTIONS, null);
model.setEOL(EndOfLineSequence.LF);
assertLineMapping(model, 'model');
@@ -98,8 +98,8 @@ export function assertSyncedModels(text: string, callback: (model: TextModel, as
assertLineMapping(model, 'model');
}
var mirrorModel2 = new MirrorTextModel(null, model.getLinesContent(), model.getEOL(), model.getVersionId());
var mirrorModel2PrevVersionId = model.getVersionId();
let mirrorModel2 = new MirrorTextModel(null, model.getLinesContent(), model.getEOL(), model.getVersionId());
let mirrorModel2PrevVersionId = model.getVersionId();
model.onDidChangeContent((e: IModelContentChangedEvent) => {
let versionId = e.versionId;
@@ -110,7 +110,7 @@ export function assertSyncedModels(text: string, callback: (model: TextModel, as
mirrorModel2.onEvents(e);
});
var assertMirrorModels = () => {
let assertMirrorModels = () => {
assertLineMapping(model, 'model');
assert.equal(mirrorModel2.getText(), model.getValue(), 'mirror model 2 text OK');
assert.equal(mirrorModel2.version, model.getVersionId(), 'mirror model 2 version OK');

273
src/vs/editor/test/common/model/intervalTree.test.ts
View File

@@ -5,7 +5,8 @@
'use strict';
import * as assert from 'assert';
import { IntervalTree, IntervalNode, getNodeColor, NodeColor, SENTINEL, intervalCompare } from 'vs/editor/common/model/intervalTree';
import { IntervalTree, IntervalNode, getNodeColor, NodeColor, SENTINEL, intervalCompare, setNodeStickiness, nodeAcceptEdit } from 'vs/editor/common/model/intervalTree';
import { TrackedRangeStickiness } from 'vs/editor/common/model';
const GENERATE_TESTS = false;
let TEST_COUNT = GENERATE_TESTS ? 10000 : 0;
@@ -554,6 +555,273 @@ suite('IntervalTree', () => {
});
});
suite('IntervalTree', () => {
function assertNodeAcceptEdit(msg: string, nodeStart: number, nodeEnd: number, nodeStickiness: TrackedRangeStickiness, start: number, end: number, textLength: number, forceMoveMarkers: boolean, expectedNodeStart: number, expectedNodeEnd: number): void {
let node = new IntervalNode('', nodeStart, nodeEnd);
setNodeStickiness(node, nodeStickiness);
nodeAcceptEdit(node, start, end, textLength, forceMoveMarkers);
assert.deepEqual([node.start, node.end], [expectedNodeStart, expectedNodeEnd], msg);
}
test('nodeAcceptEdit', () => {
// A. collapsed decoration
{
// no-op
assertNodeAcceptEdit('A.000', 0, 0, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 0, 0, 0, false, 0, 0);
assertNodeAcceptEdit('A.001', 0, 0, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 0, 0, 0, false, 0, 0);
assertNodeAcceptEdit('A.002', 0, 0, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 0, 0, 0, false, 0, 0);
assertNodeAcceptEdit('A.003', 0, 0, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 0, 0, 0, false, 0, 0);
assertNodeAcceptEdit('A.004', 0, 0, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 0, 0, 0, true, 0, 0);
assertNodeAcceptEdit('A.005', 0, 0, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 0, 0, 0, true, 0, 0);
assertNodeAcceptEdit('A.006', 0, 0, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 0, 0, 0, true, 0, 0);
assertNodeAcceptEdit('A.007', 0, 0, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 0, 0, 0, true, 0, 0);
// insertion
assertNodeAcceptEdit('A.008', 0, 0, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 0, 0, 1, false, 0, 1);
assertNodeAcceptEdit('A.009', 0, 0, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 0, 0, 1, false, 1, 1);
assertNodeAcceptEdit('A.010', 0, 0, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 0, 0, 1, false, 0, 0);
assertNodeAcceptEdit('A.011', 0, 0, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 0, 0, 1, false, 1, 1);
assertNodeAcceptEdit('A.012', 0, 0, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 0, 0, 1, true, 1, 1);
assertNodeAcceptEdit('A.013', 0, 0, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 0, 0, 1, true, 1, 1);
assertNodeAcceptEdit('A.014', 0, 0, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 0, 0, 1, true, 1, 1);
assertNodeAcceptEdit('A.015', 0, 0, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 0, 0, 1, true, 1, 1);
}
// B. non collapsed decoration
{
// no-op
assertNodeAcceptEdit('B.000', 0, 5, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 0, 0, 0, false, 0, 5);
assertNodeAcceptEdit('B.001', 0, 5, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 0, 0, 0, false, 0, 5);
assertNodeAcceptEdit('B.002', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 0, 0, 0, false, 0, 5);
assertNodeAcceptEdit('B.003', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 0, 0, 0, false, 0, 5);
assertNodeAcceptEdit('B.004', 0, 5, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 0, 0, 0, true, 0, 5);
assertNodeAcceptEdit('B.005', 0, 5, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 0, 0, 0, true, 0, 5);
assertNodeAcceptEdit('B.006', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 0, 0, 0, true, 0, 5);
assertNodeAcceptEdit('B.007', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 0, 0, 0, true, 0, 5);
// insertion at start
assertNodeAcceptEdit('B.008', 0, 5, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 0, 0, 1, false, 0, 6);
assertNodeAcceptEdit('B.009', 0, 5, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 0, 0, 1, false, 1, 6);
assertNodeAcceptEdit('B.010', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 0, 0, 1, false, 0, 6);
assertNodeAcceptEdit('B.011', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 0, 0, 1, false, 1, 6);
assertNodeAcceptEdit('B.012', 0, 5, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 0, 0, 1, true, 1, 6);
assertNodeAcceptEdit('B.013', 0, 5, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 0, 0, 1, true, 1, 6);
assertNodeAcceptEdit('B.014', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 0, 0, 1, true, 1, 6);
assertNodeAcceptEdit('B.015', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 0, 0, 1, true, 1, 6);
// insertion in middle
assertNodeAcceptEdit('B.016', 0, 5, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 2, 2, 1, false, 0, 6);
assertNodeAcceptEdit('B.017', 0, 5, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 2, 2, 1, false, 0, 6);
assertNodeAcceptEdit('B.018', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 2, 2, 1, false, 0, 6);
assertNodeAcceptEdit('B.019', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 2, 2, 1, false, 0, 6);
assertNodeAcceptEdit('B.020', 0, 5, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 2, 2, 1, true, 0, 6);
assertNodeAcceptEdit('B.021', 0, 5, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 2, 2, 1, true, 0, 6);
assertNodeAcceptEdit('B.022', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 2, 2, 1, true, 0, 6);
assertNodeAcceptEdit('B.023', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 2, 2, 1, true, 0, 6);
// insertion at end
assertNodeAcceptEdit('B.024', 0, 5, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 5, 1, false, 0, 6);
assertNodeAcceptEdit('B.025', 0, 5, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 5, 1, false, 0, 5);
assertNodeAcceptEdit('B.026', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 5, 1, false, 0, 5);
assertNodeAcceptEdit('B.027', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 5, 1, false, 0, 6);
assertNodeAcceptEdit('B.028', 0, 5, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 5, 1, true, 0, 6);
assertNodeAcceptEdit('B.029', 0, 5, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 5, 1, true, 0, 6);
assertNodeAcceptEdit('B.030', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 5, 1, true, 0, 6);
assertNodeAcceptEdit('B.031', 0, 5, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 5, 1, true, 0, 6);
// replace with larger text until start
assertNodeAcceptEdit('B.032', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 5, 2, false, 5, 11);
assertNodeAcceptEdit('B.033', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 5, 2, false, 6, 11);
assertNodeAcceptEdit('B.034', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 5, 2, false, 5, 11);
assertNodeAcceptEdit('B.035', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 5, 2, false, 6, 11);
assertNodeAcceptEdit('B.036', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 5, 2, true, 6, 11);
assertNodeAcceptEdit('B.037', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 5, 2, true, 6, 11);
assertNodeAcceptEdit('B.038', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 5, 2, true, 6, 11);
assertNodeAcceptEdit('B.039', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 5, 2, true, 6, 11);
// replace with smaller text until start
assertNodeAcceptEdit('B.040', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 3, 5, 1, false, 4, 9);
assertNodeAcceptEdit('B.041', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 3, 5, 1, false, 4, 9);
assertNodeAcceptEdit('B.042', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 3, 5, 1, false, 4, 9);
assertNodeAcceptEdit('B.043', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 3, 5, 1, false, 4, 9);
assertNodeAcceptEdit('B.044', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 3, 5, 1, true, 4, 9);
assertNodeAcceptEdit('B.045', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 3, 5, 1, true, 4, 9);
assertNodeAcceptEdit('B.046', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 3, 5, 1, true, 4, 9);
assertNodeAcceptEdit('B.047', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 3, 5, 1, true, 4, 9);
// replace with larger text select start
assertNodeAcceptEdit('B.048', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 6, 3, false, 5, 11);
assertNodeAcceptEdit('B.049', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 6, 3, false, 5, 11);
assertNodeAcceptEdit('B.050', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 6, 3, false, 5, 11);
assertNodeAcceptEdit('B.051', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 6, 3, false, 5, 11);
assertNodeAcceptEdit('B.052', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 6, 3, true, 7, 11);
assertNodeAcceptEdit('B.053', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 6, 3, true, 7, 11);
assertNodeAcceptEdit('B.054', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 6, 3, true, 7, 11);
assertNodeAcceptEdit('B.055', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 6, 3, true, 7, 11);
// replace with smaller text select start
assertNodeAcceptEdit('B.056', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 6, 1, false, 5, 9);
assertNodeAcceptEdit('B.057', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 6, 1, false, 5, 9);
assertNodeAcceptEdit('B.058', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 6, 1, false, 5, 9);
assertNodeAcceptEdit('B.059', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 6, 1, false, 5, 9);
assertNodeAcceptEdit('B.060', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 6, 1, true, 5, 9);
assertNodeAcceptEdit('B.061', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 6, 1, true, 5, 9);
assertNodeAcceptEdit('B.062', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 6, 1, true, 5, 9);
assertNodeAcceptEdit('B.063', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 6, 1, true, 5, 9);
// replace with larger text from start
assertNodeAcceptEdit('B.064', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 6, 2, false, 5, 11);
assertNodeAcceptEdit('B.065', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 6, 2, false, 5, 11);
assertNodeAcceptEdit('B.066', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 6, 2, false, 5, 11);
assertNodeAcceptEdit('B.067', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 6, 2, false, 5, 11);
assertNodeAcceptEdit('B.068', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 6, 2, true, 7, 11);
assertNodeAcceptEdit('B.069', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 6, 2, true, 7, 11);
assertNodeAcceptEdit('B.070', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 6, 2, true, 7, 11);
assertNodeAcceptEdit('B.071', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 6, 2, true, 7, 11);
// replace with smaller text from start
assertNodeAcceptEdit('B.072', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 7, 1, false, 5, 9);
assertNodeAcceptEdit('B.073', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 7, 1, false, 5, 9);
assertNodeAcceptEdit('B.074', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 7, 1, false, 5, 9);
assertNodeAcceptEdit('B.075', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 7, 1, false, 5, 9);
assertNodeAcceptEdit('B.076', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 7, 1, true, 6, 9);
assertNodeAcceptEdit('B.077', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 7, 1, true, 6, 9);
assertNodeAcceptEdit('B.078', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 7, 1, true, 6, 9);
assertNodeAcceptEdit('B.079', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 7, 1, true, 6, 9);
// replace with larger text to end
assertNodeAcceptEdit('B.080', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 10, 2, false, 5, 11);
assertNodeAcceptEdit('B.081', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 10, 2, false, 5, 10);
assertNodeAcceptEdit('B.082', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 10, 2, false, 5, 10);
assertNodeAcceptEdit('B.083', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 10, 2, false, 5, 11);
assertNodeAcceptEdit('B.084', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 10, 2, true, 5, 11);
assertNodeAcceptEdit('B.085', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 10, 2, true, 5, 11);
assertNodeAcceptEdit('B.086', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 10, 2, true, 5, 11);
assertNodeAcceptEdit('B.087', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 10, 2, true, 5, 11);
// replace with smaller text to end
assertNodeAcceptEdit('B.088', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 8, 10, 1, false, 5, 9);
assertNodeAcceptEdit('B.089', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 8, 10, 1, false, 5, 9);
assertNodeAcceptEdit('B.090', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 8, 10, 1, false, 5, 9);
assertNodeAcceptEdit('B.091', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 8, 10, 1, false, 5, 9);
assertNodeAcceptEdit('B.092', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 8, 10, 1, true, 5, 9);
assertNodeAcceptEdit('B.093', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 8, 10, 1, true, 5, 9);
assertNodeAcceptEdit('B.094', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 8, 10, 1, true, 5, 9);
assertNodeAcceptEdit('B.095', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 8, 10, 1, true, 5, 9);
// replace with larger text select end
assertNodeAcceptEdit('B.096', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 11, 3, false, 5, 10);
assertNodeAcceptEdit('B.097', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 11, 3, false, 5, 10);
assertNodeAcceptEdit('B.098', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 11, 3, false, 5, 10);
assertNodeAcceptEdit('B.099', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 11, 3, false, 5, 10);
assertNodeAcceptEdit('B.100', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 11, 3, true, 5, 12);
assertNodeAcceptEdit('B.101', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 11, 3, true, 5, 12);
assertNodeAcceptEdit('B.102', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 11, 3, true, 5, 12);
assertNodeAcceptEdit('B.103', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 11, 3, true, 5, 12);
// replace with smaller text select end
assertNodeAcceptEdit('B.104', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 11, 1, false, 5, 10);
assertNodeAcceptEdit('B.105', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 11, 1, false, 5, 10);
assertNodeAcceptEdit('B.106', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 11, 1, false, 5, 10);
assertNodeAcceptEdit('B.107', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 11, 1, false, 5, 10);
assertNodeAcceptEdit('B.108', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 11, 1, true, 5, 10);
assertNodeAcceptEdit('B.109', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 11, 1, true, 5, 10);
assertNodeAcceptEdit('B.110', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 11, 1, true, 5, 10);
assertNodeAcceptEdit('B.111', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 11, 1, true, 5, 10);
// replace with larger text from end
assertNodeAcceptEdit('B.112', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 10, 11, 3, false, 5, 10);
assertNodeAcceptEdit('B.113', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 10, 11, 3, false, 5, 10);
assertNodeAcceptEdit('B.114', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 10, 11, 3, false, 5, 10);
assertNodeAcceptEdit('B.115', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 10, 11, 3, false, 5, 10);
assertNodeAcceptEdit('B.116', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 10, 11, 3, true, 5, 13);
assertNodeAcceptEdit('B.117', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 10, 11, 3, true, 5, 13);
assertNodeAcceptEdit('B.118', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 10, 11, 3, true, 5, 13);
assertNodeAcceptEdit('B.119', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 10, 11, 3, true, 5, 13);
// replace with smaller text from end
assertNodeAcceptEdit('B.120', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 10, 12, 1, false, 5, 10);
assertNodeAcceptEdit('B.121', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 10, 12, 1, false, 5, 10);
assertNodeAcceptEdit('B.122', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 10, 12, 1, false, 5, 10);
assertNodeAcceptEdit('B.123', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 10, 12, 1, false, 5, 10);
assertNodeAcceptEdit('B.124', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 10, 12, 1, true, 5, 11);
assertNodeAcceptEdit('B.125', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 10, 12, 1, true, 5, 11);
assertNodeAcceptEdit('B.126', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 10, 12, 1, true, 5, 11);
assertNodeAcceptEdit('B.127', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 10, 12, 1, true, 5, 11);
// delete until start
assertNodeAcceptEdit('B.128', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 5, 0, false, 4, 9);
assertNodeAcceptEdit('B.129', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 5, 0, false, 4, 9);
assertNodeAcceptEdit('B.130', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 5, 0, false, 4, 9);
assertNodeAcceptEdit('B.131', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 5, 0, false, 4, 9);
assertNodeAcceptEdit('B.132', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 5, 0, true, 4, 9);
assertNodeAcceptEdit('B.133', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 5, 0, true, 4, 9);
assertNodeAcceptEdit('B.134', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 5, 0, true, 4, 9);
assertNodeAcceptEdit('B.135', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 5, 0, true, 4, 9);
// delete select start
assertNodeAcceptEdit('B.136', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 6, 0, false, 4, 8);
assertNodeAcceptEdit('B.137', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 6, 0, false, 4, 8);
assertNodeAcceptEdit('B.138', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 6, 0, false, 4, 8);
assertNodeAcceptEdit('B.139', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 6, 0, false, 4, 8);
assertNodeAcceptEdit('B.140', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 4, 6, 0, true, 4, 8);
assertNodeAcceptEdit('B.141', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 4, 6, 0, true, 4, 8);
assertNodeAcceptEdit('B.142', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 4, 6, 0, true, 4, 8);
assertNodeAcceptEdit('B.143', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 4, 6, 0, true, 4, 8);
// delete from start
assertNodeAcceptEdit('B.144', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 6, 0, false, 5, 9);
assertNodeAcceptEdit('B.145', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 6, 0, false, 5, 9);
assertNodeAcceptEdit('B.146', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 6, 0, false, 5, 9);
assertNodeAcceptEdit('B.147', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 6, 0, false, 5, 9);
assertNodeAcceptEdit('B.148', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 6, 0, true, 5, 9);
assertNodeAcceptEdit('B.149', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 6, 0, true, 5, 9);
assertNodeAcceptEdit('B.150', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 6, 0, true, 5, 9);
assertNodeAcceptEdit('B.151', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 6, 0, true, 5, 9);
// delete to end
assertNodeAcceptEdit('B.152', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 10, 0, false, 5, 9);
assertNodeAcceptEdit('B.153', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 10, 0, false, 5, 9);
assertNodeAcceptEdit('B.154', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 10, 0, false, 5, 9);
assertNodeAcceptEdit('B.155', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 10, 0, false, 5, 9);
assertNodeAcceptEdit('B.156', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 10, 0, true, 5, 9);
assertNodeAcceptEdit('B.157', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 10, 0, true, 5, 9);
assertNodeAcceptEdit('B.158', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 10, 0, true, 5, 9);
assertNodeAcceptEdit('B.159', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 10, 0, true, 5, 9);
// delete select end
assertNodeAcceptEdit('B.160', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 11, 0, false, 5, 9);
assertNodeAcceptEdit('B.161', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 11, 0, false, 5, 9);
assertNodeAcceptEdit('B.162', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 11, 0, false, 5, 9);
assertNodeAcceptEdit('B.163', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 11, 0, false, 5, 9);
assertNodeAcceptEdit('B.164', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 9, 11, 0, true, 5, 9);
assertNodeAcceptEdit('B.165', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 9, 11, 0, true, 5, 9);
assertNodeAcceptEdit('B.166', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 9, 11, 0, true, 5, 9);
assertNodeAcceptEdit('B.167', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 9, 11, 0, true, 5, 9);
// delete from end
assertNodeAcceptEdit('B.168', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 10, 11, 0, false, 5, 10);
assertNodeAcceptEdit('B.169', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 10, 11, 0, false, 5, 10);
assertNodeAcceptEdit('B.170', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 10, 11, 0, false, 5, 10);
assertNodeAcceptEdit('B.171', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 10, 11, 0, false, 5, 10);
assertNodeAcceptEdit('B.172', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 10, 11, 0, true, 5, 10);
assertNodeAcceptEdit('B.173', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 10, 11, 0, true, 5, 10);
assertNodeAcceptEdit('B.174', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 10, 11, 0, true, 5, 10);
assertNodeAcceptEdit('B.175', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 10, 11, 0, true, 5, 10);
// replace with larger text entire
assertNodeAcceptEdit('B.176', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 10, 3, false, 5, 8);
assertNodeAcceptEdit('B.177', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 10, 3, false, 5, 8);
assertNodeAcceptEdit('B.178', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 10, 3, false, 5, 8);
assertNodeAcceptEdit('B.179', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 10, 3, false, 5, 8);
assertNodeAcceptEdit('B.180', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 10, 3, true, 8, 8);
assertNodeAcceptEdit('B.181', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 10, 3, true, 8, 8);
assertNodeAcceptEdit('B.182', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 10, 3, true, 8, 8);
assertNodeAcceptEdit('B.183', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 10, 3, true, 8, 8);
// replace with smaller text entire
assertNodeAcceptEdit('B.184', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 10, 7, false, 5, 12);
assertNodeAcceptEdit('B.185', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 10, 7, false, 5, 10);
assertNodeAcceptEdit('B.186', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 10, 7, false, 5, 10);
assertNodeAcceptEdit('B.187', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 10, 7, false, 5, 12);
assertNodeAcceptEdit('B.188', 5, 10, TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges, 5, 10, 7, true, 12, 12);
assertNodeAcceptEdit('B.189', 5, 10, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, 5, 10, 7, true, 12, 12);
assertNodeAcceptEdit('B.190', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingBefore, 5, 10, 7, true, 12, 12);
assertNodeAcceptEdit('B.191', 5, 10, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter, 5, 10, 7, true, 12, 12);
}
});
});
function printTree(T: IntervalTree): void {
if (T.root === SENTINEL) {
console.log(`~~ empty`);
@@ -601,7 +869,7 @@ function depth(n: IntervalNode): number {
return (getNodeColor(n) === NodeColor.Black ? 1 : 0) + depth(n.left);
}
function assertValidNode(n: IntervalNode, delta): void {
function assertValidNode(n: IntervalNode, delta: number): void {
if (n === SENTINEL) {
return;
}
@@ -639,3 +907,4 @@ function assertValidTree(T: IntervalTree): void {
}
//#endregion

2
src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
View File

@@ -31,7 +31,7 @@ suite('PieceTreeTextBuffer._getInverseEdits', () => {
}
function assertInverseEdits(ops: IValidatedEditOperation[], expected: Range[]): void {
var actual = PieceTreeTextBuffer._getInverseEditRanges(ops);
let actual = PieceTreeTextBuffer._getInverseEditRanges(ops);
assert.deepEqual(actual, expected);
}

2
src/vs/editor/test/common/model/model.modes.test.ts
View File

@@ -197,7 +197,7 @@ suite('Editor Model - Model Modes 2', () => {
}
function statesEqual(model: TextModel, states: string[]): void {
var i, len = states.length - 1;
let i, len = states.length - 1;
for (i = 0; i < len; i++) {
stateEqual(model._tokens._getState(i), states[i]);
}

20
src/vs/editor/test/common/model/model.test.ts
View File

@@ -22,18 +22,18 @@ import { dispose, Disposable } from 'vs/base/common/lifecycle';
// --------- utils
var LINE1 = 'My First Line';
var LINE2 = '\t\tMy Second Line';
var LINE3 = ' Third Line';
var LINE4 = '';
var LINE5 = '1';
const LINE1 = 'My First Line';
const LINE2 = '\t\tMy Second Line';
const LINE3 = ' Third Line';
const LINE4 = '';
const LINE5 = '1';
suite('Editor Model - Model', () => {
var thisModel: TextModel;
let thisModel: TextModel;
setup(() => {
var text =
const text =
LINE1 + '\r\n' +
LINE2 + '\n' +
LINE3 + '\n' +
@@ -344,10 +344,10 @@ suite('Editor Model - Model', () => {
// --------- Special Unicode LINE SEPARATOR character
suite('Editor Model - Model Line Separators', () => {
var thisModel: TextModel;
let thisModel: TextModel;
setup(() => {
var text =
const text =
LINE1 + '\u2028' +
LINE2 + '\n' +
LINE3 + '\u2028' +
@@ -369,7 +369,7 @@ suite('Editor Model - Model Line Separators', () => {
});
test('Bug 13333:Model should line break on lonely CR too', () => {
var model = TextModel.createFromString('Hello\rWorld!\r\nAnother line');
let model = TextModel.createFromString('Hello\rWorld!\r\nAnother line');
assert.equal(model.getLineCount(), 3);
assert.equal(model.getValue(), 'Hello\r\nWorld!\r\nAnother line');
model.dispose();

60
src/vs/editor/test/common/model/modelDecorations.test.ts
View File

@@ -51,9 +51,9 @@ function addDecoration(model: TextModel, startLineNumber: number, startColumn: n
}
function lineHasDecorations(model: TextModel, lineNumber: number, decorations: { start: number; end: number; className: string; }[]) {
var lineDecorations = [];
var decs = model.getLineDecorations(lineNumber);
for (var i = 0, len = decs.length; i < len; i++) {
let lineDecorations = [];
let decs = model.getLineDecorations(lineNumber);
for (let i = 0, len = decs.length; i < len; i++) {
lineDecorations.push({
start: decs[i].range.startColumn,
end: decs[i].range.endColumn,
@@ -76,18 +76,18 @@ function lineHasDecoration(model: TextModel, lineNumber: number, start: number,
}
suite('Editor Model - Model Decorations', () => {
var LINE1 = 'My First Line';
var LINE2 = '\t\tMy Second Line';
var LINE3 = ' Third Line';
var LINE4 = '';
var LINE5 = '1';
const LINE1 = 'My First Line';
const LINE2 = '\t\tMy Second Line';
const LINE3 = ' Third Line';
const LINE4 = '';
const LINE5 = '1';
// --------- Model Decorations
var thisModel: TextModel;
let thisModel: TextModel;
setup(() => {
var text =
const text =
LINE1 + '\r\n' +
LINE2 + '\n' +
LINE3 + '\n' +
@@ -122,11 +122,11 @@ suite('Editor Model - Model Decorations', () => {
test('full line decoration', () => {
addDecoration(thisModel, 1, 1, 2, 1, 'myType');
var line1Decorations = thisModel.getLineDecorations(1);
let line1Decorations = thisModel.getLineDecorations(1);
assert.equal(line1Decorations.length, 1);
assert.equal(line1Decorations[0].options.className, 'myType');
var line2Decorations = thisModel.getLineDecorations(1);
let line2Decorations = thisModel.getLineDecorations(1);
assert.equal(line2Decorations.length, 1);
assert.equal(line2Decorations[0].options.className, 'myType');
@@ -138,15 +138,15 @@ suite('Editor Model - Model Decorations', () => {
test('multiple line decoration', () => {
addDecoration(thisModel, 1, 2, 3, 2, 'myType');
var line1Decorations = thisModel.getLineDecorations(1);
let line1Decorations = thisModel.getLineDecorations(1);
assert.equal(line1Decorations.length, 1);
assert.equal(line1Decorations[0].options.className, 'myType');
var line2Decorations = thisModel.getLineDecorations(1);
let line2Decorations = thisModel.getLineDecorations(1);
assert.equal(line2Decorations.length, 1);
assert.equal(line2Decorations[0].options.className, 'myType');
var line3Decorations = thisModel.getLineDecorations(1);
let line3Decorations = thisModel.getLineDecorations(1);
assert.equal(line3Decorations.length, 1);
assert.equal(line3Decorations[0].options.className, 'myType');
@@ -157,7 +157,7 @@ suite('Editor Model - Model Decorations', () => {
// --------- removing, changing decorations
test('decoration gets removed', () => {
var decId = addDecoration(thisModel, 1, 2, 3, 2, 'myType');
let decId = addDecoration(thisModel, 1, 2, 3, 2, 'myType');
modelHasDecoration(thisModel, 1, 2, 3, 2, 'myType');
thisModel.changeDecorations((changeAccessor) => {
changeAccessor.removeDecoration(decId);
@@ -166,8 +166,8 @@ suite('Editor Model - Model Decorations', () => {
});
test('decorations get removed', () => {
var decId1 = addDecoration(thisModel, 1, 2, 3, 2, 'myType1');
var decId2 = addDecoration(thisModel, 1, 2, 3, 1, 'myType2');
let decId1 = addDecoration(thisModel, 1, 2, 3, 2, 'myType1');
let decId2 = addDecoration(thisModel, 1, 2, 3, 1, 'myType2');
modelHasDecorations(thisModel, [
{
range: new Range(1, 2, 3, 1),
@@ -194,7 +194,7 @@ suite('Editor Model - Model Decorations', () => {
});
test('decoration range can be changed', () => {
var decId = addDecoration(thisModel, 1, 2, 3, 2, 'myType');
let decId = addDecoration(thisModel, 1, 2, 3, 2, 'myType');
modelHasDecoration(thisModel, 1, 2, 3, 2, 'myType');
thisModel.changeDecorations((changeAccessor) => {
changeAccessor.changeDecoration(decId, new Range(1, 1, 1, 2));
@@ -1150,11 +1150,11 @@ suite('deltaDecorations', () => {
function testDeltaDecorations(text: string[], decorations: ILightWeightDecoration[], newDecorations: ILightWeightDecoration[]): void {
var model = TextModel.createFromString(text.join('\n'));
let model = TextModel.createFromString(text.join('\n'));
// Add initial decorations & assert they are added
var initialIds = model.deltaDecorations([], decorations.map(toModelDeltaDecoration));
var actualDecorations = readModelDecorations(model, initialIds);
let initialIds = model.deltaDecorations([], decorations.map(toModelDeltaDecoration));
let actualDecorations = readModelDecorations(model, initialIds);
assert.equal(initialIds.length, decorations.length, 'returns expected cnt of ids');
assert.equal(initialIds.length, model.getAllDecorations().length, 'does not leak decorations');
@@ -1162,8 +1162,8 @@ suite('deltaDecorations', () => {
decorations.sort((a, b) => strcmp(a.id, b.id));
assert.deepEqual(actualDecorations, decorations);
var newIds = model.deltaDecorations(initialIds, newDecorations.map(toModelDeltaDecoration));
var actualNewDecorations = readModelDecorations(model, newIds);
let newIds = model.deltaDecorations(initialIds, newDecorations.map(toModelDeltaDecoration));
let actualNewDecorations = readModelDecorations(model, newIds);
assert.equal(newIds.length, newDecorations.length, 'returns expected cnt of ids');
assert.equal(newIds.length, model.getAllDecorations().length, 'does not leak decorations');
@@ -1179,12 +1179,12 @@ suite('deltaDecorations', () => {
}
test('result respects input', () => {
var model = TextModel.createFromString([
let model = TextModel.createFromString([
'Hello world,',
'How are you?'
].join('\n'));
var ids = model.deltaDecorations([], [
let ids = model.deltaDecorations([], [
toModelDeltaDecoration(decoration('a', 1, 1, 1, 12)),
toModelDeltaDecoration(decoration('b', 2, 1, 2, 13))
]);
@@ -1301,12 +1301,12 @@ suite('deltaDecorations', () => {
});
test('model doesn\'t get confused with individual tracked ranges', () => {
var model = TextModel.createFromString([
let model = TextModel.createFromString([
'Hello world,',
'How are you?'
].join('\n'));
var trackedRangeId = model.changeDecorations((changeAcessor) => {
let trackedRangeId = model.changeDecorations((changeAcessor) => {
return changeAcessor.addDecoration(
{
startLineNumber: 1,
@@ -1322,7 +1322,7 @@ suite('deltaDecorations', () => {
changeAccessor.removeDecoration(trackedRangeId);
});
var ids = model.deltaDecorations([], [
let ids = model.deltaDecorations([], [
toModelDeltaDecoration(decoration('a', 1, 1, 1, 12)),
toModelDeltaDecoration(decoration('b', 2, 1, 2, 13))
]);
@@ -1342,7 +1342,7 @@ suite('deltaDecorations', () => {
});
test('issue #16922: Clicking on link doesn\'t seem to do anything', () => {
var model = TextModel.createFromString([
let model = TextModel.createFromString([
'Hello world,',
'How are you?',
'Fine.',

24
src/vs/editor/test/common/model/modelEditOperation.test.ts
View File

@@ -10,16 +10,16 @@ import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
import { TextModel } from 'vs/editor/common/model/textModel';
suite('Editor Model - Model Edit Operation', () => {
var LINE1 = 'My First Line';
var LINE2 = '\t\tMy Second Line';
var LINE3 = ' Third Line';
var LINE4 = '';
var LINE5 = '1';
const LINE1 = 'My First Line';
const LINE2 = '\t\tMy Second Line';
const LINE3 = ' Third Line';
const LINE4 = '';
const LINE5 = '1';
var model: TextModel;
let model: TextModel;
setup(() => {
var text =
const text =
LINE1 + '\r\n' +
LINE2 + '\n' +
LINE3 + '\n' +
@@ -34,7 +34,7 @@ suite('Editor Model - Model Edit Operation', () => {
});
function createSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): IIdentifiedSingleEditOperation {
var range = new Range(
let range = new Range(
selectionLineNumber,
selectionColumn,
positionLineNumber,
@@ -50,16 +50,16 @@ suite('Editor Model - Model Edit Operation', () => {
}
function assertSingleEditOp(singleEditOp: IIdentifiedSingleEditOperation, editedLines: string[]) {
var editOp = [singleEditOp];
let editOp = [singleEditOp];
var inverseEditOp = model.applyEdits(editOp);
let inverseEditOp = model.applyEdits(editOp);
assert.equal(model.getLineCount(), editedLines.length);
for (var i = 0; i < editedLines.length; i++) {
for (let i = 0; i < editedLines.length; i++) {
assert.equal(model.getLineContent(i + 1), editedLines[i]);
}
var originalOp = model.applyEdits(inverseEditOp);
let originalOp = model.applyEdits(inverseEditOp);
assert.equal(model.getLineCount(), 5);
assert.equal(model.getLineContent(1), LINE1);

4
src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
View File

@@ -32,7 +32,7 @@ function randomStr(len: number) {
len = 10;
}
return (function () {
var j, ref, results;
let j, ref, results;
results = [];
for (
j = 1, ref = len;
@@ -1696,7 +1696,7 @@ suite('search offset cache', () => {
pieceTable.delete(15, 2);
str = str.substring(0, 15) + str.substring(15 + 2);
var content = pieceTable.getLinesRawContent();
let content = pieceTable.getLinesRawContent();
assert(content === str);
});

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

@@ -12,7 +12,7 @@ import { UTF8_BOM_CHARACTER } from 'vs/base/common/strings';
import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
function testGuessIndentation(defaultInsertSpaces: boolean, defaultTabSize: number, expectedInsertSpaces: boolean, expectedTabSize: number, text: string[], msg?: string): void {
var m = createTextModel(
let m = createTextModel(
text.join('\n'),
{
tabSize: defaultTabSize,
@@ -20,7 +20,7 @@ function testGuessIndentation(defaultInsertSpaces: boolean, defaultTabSize: numb
detectIndentation: true
}
);
var r = m.getOptions();
let r = m.getOptions();
m.dispose();
assert.equal(r.insertSpaces, expectedInsertSpaces, msg);
@@ -151,7 +151,7 @@ suite('Editor Model - TextModel', () => {
test('getValueLengthInRange', () => {
var m = TextModel.createFromString('My First Line\r\nMy Second Line\r\nMy Third Line');
let m = TextModel.createFromString('My First Line\r\nMy Second Line\r\nMy Third Line');
assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length);
assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length);
assert.equal(m.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length);
@@ -508,7 +508,7 @@ suite('Editor Model - TextModel', () => {
' x',
' x',
], '6x4, 2x5, 4x8');
assertGuess(true, 4, [
assertGuess(true, undefined, [
'x',
' x',
' x',
@@ -531,6 +531,25 @@ suite('Editor Model - TextModel', () => {
], 'mixed whitespace 2');
});
test('issue #44991: Wrong indentation size auto-detection', () => {
assertGuess(true, 4, [
'a = 10 # 0 space indent',
'b = 5 # 0 space indent',
'if a > 10: # 0 space indent',
' a += 1 # 4 space indent delta 4 spaces',
' if b > 5: # 4 space indent',
' b += 1 # 8 space indent delta 4 spaces',
' b += 1 # 8 space indent',
' b += 1 # 8 space indent',
'# comment line 1 # 0 space indent delta 8 spaces',
'# comment line 2 # 0 space indent',
'# comment line 3 # 0 space indent',
' b += 1 # 8 space indent delta 8 spaces',
' b += 1 # 8 space indent',
' b += 1 # 8 space indent',
]);
});
test('validatePosition', () => {
let m = TextModel.createFromString('line one\nline two');
@@ -601,6 +620,18 @@ suite('Editor Model - TextModel', () => {
});
test('validatePosition handle NaN.', () => {
let m = TextModel.createFromString('line one\nline two');
assert.deepEqual(m.validatePosition(new Position(NaN, 1)), new Position(1, 1));
assert.deepEqual(m.validatePosition(new Position(1, NaN)), new Position(1, 1));
assert.deepEqual(m.validatePosition(new Position(NaN, NaN)), new Position(1, 1));
assert.deepEqual(m.validatePosition(new Position(2, NaN)), new Position(2, 1));
assert.deepEqual(m.validatePosition(new Position(NaN, 3)), new Position(1, 3));
});
test('validateRange around high-low surrogate pairs 1', () => {
let m = TextModel.createFromString('a📚b');
@@ -674,7 +705,7 @@ suite('Editor Model - TextModel', () => {
test('modifyPosition', () => {
var m = TextModel.createFromString('line one\nline two');
let m = TextModel.createFromString('line one\nline two');
assert.deepEqual(m.modifyPosition(new Position(1, 1), 0), new Position(1, 1));
assert.deepEqual(m.modifyPosition(new Position(0, 0), 0), new Position(1, 1));
assert.deepEqual(m.modifyPosition(new Position(30, 1), 0), new Position(2, 9));
@@ -810,6 +841,12 @@ suite('Editor Model - TextModel', () => {
assert.equal(model.getLineLastNonWhitespaceColumn(11), 0, '11');
assert.equal(model.getLineLastNonWhitespaceColumn(12), 0, '12');
});
test('#50471. getValueInRange with invalid range', () => {
let m = TextModel.createFromString('My First Line\r\nMy Second Line\r\nMy Third Line');
assert.equal(m.getValueInRange(new Range(1, NaN, 1, 3)), 'My');
assert.equal(m.getValueInRange(new Range(NaN, NaN, NaN, NaN)), '');
});
});
suite('TextModel.mightContainRTL', () => {

21
src/vs/editor/test/common/model/textModelWithTokens.test.ts
View File

@@ -596,4 +596,25 @@ suite('TextModel.getLineIndentGuide', () => {
[0, 'include script'],
]);
});
test('issue #49173', () => {
let model = TextModel.createFromString([
'class A {',
' public m1(): void {',
' }',
' public m2(): void {',
' }',
' public m3(): void {',
' }',
' public m4(): void {',
' }',
' public m5(): void {',
' }',
'}',
].join('\n'));
const actual = model.getActiveIndentGuide(2, 4, 9);
assert.deepEqual(actual, { startLineNumber: 2, endLineNumber: 9, indent: 1 });
model.dispose();
});
});

8
src/vs/editor/test/common/modes/linkComputer.test.ts
View File

@@ -24,12 +24,12 @@ class SimpleLinkComputerTarget implements ILinkComputerTarget {
}
function myComputeLinks(lines: string[]): ILink[] {
var target = new SimpleLinkComputerTarget(lines);
let target = new SimpleLinkComputerTarget(lines);
return computeLinks(target);
}
function assertLink(text: string, extractedLink: string): void {
var startColumn = 0,
let startColumn = 0,
endColumn = 0,
chr: string,
i = 0;
@@ -50,7 +50,7 @@ function assertLink(text: string, extractedLink: string): void {
}
}
var r = myComputeLinks([text]);
let r = myComputeLinks([text]);
assert.deepEqual(r, [{
range: {
startLineNumber: 1,
@@ -65,7 +65,7 @@ function assertLink(text: string, extractedLink: string): void {
suite('Editor Modes - Link Computer', () => {
test('Null model', () => {
var r = computeLinks(null);
let r = computeLinks(null);
assert.deepEqual(r, []);
});

8
src/vs/editor/test/common/modes/supports/electricCharacter.test.ts
View File

@@ -33,7 +33,7 @@ suite('Editor Modes - Auto Indentation', () => {
}
test('Doc comments', () => {
var brackets = new BracketElectricCharacterSupport(null, [{ open: '/**', close: ' */' }], null);
let brackets = new BracketElectricCharacterSupport(null, [{ open: '/**', close: ' */' }], null);
testAppends(brackets, [
{ text: '/*', type: StandardTokenType.Other },
@@ -47,7 +47,7 @@ suite('Editor Modes - Auto Indentation', () => {
});
test('getElectricCharacters uses all sources and dedups', () => {
var sup = new BracketElectricCharacterSupport(
let sup = new BracketElectricCharacterSupport(
new RichEditBrackets(fakeLanguageIdentifier, [
['{', '}'],
['(', ')']
@@ -63,7 +63,7 @@ suite('Editor Modes - Auto Indentation', () => {
});
test('auto-close', () => {
var sup = new BracketElectricCharacterSupport(
let sup = new BracketElectricCharacterSupport(
new RichEditBrackets(fakeLanguageIdentifier, [
['{', '}'],
['(', ')']
@@ -105,7 +105,7 @@ suite('Editor Modes - Auto Indentation', () => {
});
test('matchOpenBracket', () => {
var sup = new BracketElectricCharacterSupport(
let sup = new BracketElectricCharacterSupport(
new RichEditBrackets(fakeLanguageIdentifier, [
['{', '}'],
['(', ')']

14
src/vs/editor/test/common/modes/supports/onEnter.test.ts
View File

@@ -11,15 +11,15 @@ import { OnEnterSupport } from 'vs/editor/common/modes/supports/onEnter';
suite('OnEnter', () => {
test('uses brackets', () => {
var brackets: CharacterPair[] = [
let brackets: CharacterPair[] = [
['(', ')'],
['begin', 'end']
];
var support = new OnEnterSupport({
let support = new OnEnterSupport({
brackets: brackets
});
var testIndentAction = (beforeText: string, afterText: string, expected: IndentAction) => {
var actual = support.onEnter('', beforeText, afterText);
let testIndentAction = (beforeText: string, afterText: string, expected: IndentAction) => {
let actual = support.onEnter('', beforeText, afterText);
if (expected === IndentAction.None) {
assert.equal(actual, null);
} else {
@@ -48,7 +48,7 @@ suite('OnEnter', () => {
});
test('uses regExpRules', () => {
var support = new OnEnterSupport({
let support = new OnEnterSupport({
regExpRules: [
{
beforeText: /^\s*\/\*\*(?!\/)([^\*]|\*(?!\/))*$/,
@@ -73,8 +73,8 @@ suite('OnEnter', () => {
}
]
});
var testIndentAction = (beforeText: string, afterText: string, expectedIndentAction: IndentAction, expectedAppendText: string, removeText: number = 0) => {
var actual = support.onEnter('', beforeText, afterText);
let testIndentAction = (beforeText: string, afterText: string, expectedIndentAction: IndentAction, expectedAppendText: string, removeText: number = 0) => {
let actual = support.onEnter('', beforeText, afterText);
if (expectedIndentAction === null) {
assert.equal(actual, null, 'isNull:' + beforeText);
} else {

5
src/vs/editor/test/common/modes/supports/richEditBrackets.test.ts
View File

@@ -66,6 +66,11 @@ suite('richEditBrackets', () => {
assert.equal(result.endColumn, 12);
});
test('findNextBracketInToken with emoty result', () => {
let result = findNextBracketInToken(/(\{)|(\})/i, '', 0, 0);
assert.equal(result, null);
});
test('issue #3894: [Handlebars] Curly braces edit issues', () => {
let result = findPrevBracketInToken(/(\-\-!<)|(>\-\-)|(\{\{)|(\}\})/i, '{{asd}}', 0, 2);
assert.equal(result.startColumn, 1);

40
src/vs/editor/test/common/modes/supports/tokenization.test.ts
View File

@@ -15,7 +15,7 @@ suite('Token theme matching', () => {
{ token: '', foreground: '100000', background: '200000' },
{ token: 'punctuation.definition.string.begin.html', foreground: '300000' },
{ token: 'punctuation.definition.string', foreground: '400000' },
]);
], []);
let colorMap = new ColorMap();
colorMap.getId('100000');
@@ -42,7 +42,7 @@ suite('Token theme matching', () => {
{ token: 'constant.numeric.oct', fontStyle: 'bold italic underline' },
{ token: 'constant.numeric.dec', fontStyle: '', foreground: '500000' },
{ token: 'storage.object.bar', fontStyle: '', foreground: '600000' },
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('F8F8F2');
@@ -167,7 +167,7 @@ suite('Token theme resolving', () => {
});
test('always has defaults', () => {
let actual = TokenTheme.createFromParsedTokenTheme([]);
let actual = TokenTheme.createFromParsedTokenTheme([], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('000000');
const _B = colorMap.getId('ffffff');
@@ -178,7 +178,7 @@ suite('Token theme resolving', () => {
test('respects incoming defaults 1', () => {
let actual = TokenTheme.createFromParsedTokenTheme([
new ParsedTokenThemeRule('', -1, FontStyle.NotSet, null, null)
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('000000');
const _B = colorMap.getId('ffffff');
@@ -189,7 +189,7 @@ suite('Token theme resolving', () => {
test('respects incoming defaults 2', () => {
let actual = TokenTheme.createFromParsedTokenTheme([
new ParsedTokenThemeRule('', -1, FontStyle.None, null, null)
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('000000');
const _B = colorMap.getId('ffffff');
@@ -200,7 +200,7 @@ suite('Token theme resolving', () => {
test('respects incoming defaults 3', () => {
let actual = TokenTheme.createFromParsedTokenTheme([
new ParsedTokenThemeRule('', -1, FontStyle.Bold, null, null)
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('000000');
const _B = colorMap.getId('ffffff');
@@ -211,7 +211,7 @@ suite('Token theme resolving', () => {
test('respects incoming defaults 4', () => {
let actual = TokenTheme.createFromParsedTokenTheme([
new ParsedTokenThemeRule('', -1, FontStyle.NotSet, 'ff0000', null)
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('ff0000');
const _B = colorMap.getId('ffffff');
@@ -222,7 +222,7 @@ suite('Token theme resolving', () => {
test('respects incoming defaults 5', () => {
let actual = TokenTheme.createFromParsedTokenTheme([
new ParsedTokenThemeRule('', -1, FontStyle.NotSet, null, 'ff0000')
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('000000');
const _B = colorMap.getId('ff0000');
@@ -235,7 +235,7 @@ suite('Token theme resolving', () => {
new ParsedTokenThemeRule('', -1, FontStyle.NotSet, null, 'ff0000'),
new ParsedTokenThemeRule('', -1, FontStyle.NotSet, '00ff00', null),
new ParsedTokenThemeRule('', -1, FontStyle.Bold, null, null),
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('00ff00');
const _B = colorMap.getId('ff0000');
@@ -247,7 +247,7 @@ suite('Token theme resolving', () => {
let actual = TokenTheme.createFromParsedTokenTheme([
new ParsedTokenThemeRule('', -1, FontStyle.NotSet, 'F8F8F2', '272822'),
new ParsedTokenThemeRule('var', -1, FontStyle.NotSet, 'ff0000', null)
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('F8F8F2');
const _B = colorMap.getId('272822');
@@ -264,7 +264,7 @@ suite('Token theme resolving', () => {
new ParsedTokenThemeRule('', -1, FontStyle.NotSet, 'F8F8F2', '272822'),
new ParsedTokenThemeRule('var', 1, FontStyle.Bold, null, null),
new ParsedTokenThemeRule('var', 0, FontStyle.NotSet, 'ff0000', null),
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('F8F8F2');
const _B = colorMap.getId('272822');
@@ -281,7 +281,7 @@ suite('Token theme resolving', () => {
new ParsedTokenThemeRule('', -1, FontStyle.NotSet, 'F8F8F2', '272822'),
new ParsedTokenThemeRule('var', -1, FontStyle.Bold, 'ff0000', null),
new ParsedTokenThemeRule('var.identifier', -1, FontStyle.NotSet, '00ff00', null),
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('F8F8F2');
const _B = colorMap.getId('272822');
@@ -306,7 +306,7 @@ suite('Token theme resolving', () => {
new ParsedTokenThemeRule('constant.numeric.hex', 6, FontStyle.Bold, null, null),
new ParsedTokenThemeRule('constant.numeric.oct', 7, FontStyle.Bold | FontStyle.Italic | FontStyle.Underline, null, null),
new ParsedTokenThemeRule('constant.numeric.dec', 8, FontStyle.None, '300000', null),
]);
], []);
let colorMap = new ColorMap();
const _A = colorMap.getId('F8F8F2');
const _B = colorMap.getId('272822');
@@ -330,4 +330,18 @@ suite('Token theme resolving', () => {
});
assert.deepEqual(actual.getThemeTrieElement(), root);
});
test('custom colors are first in color map', () => {
let actual = TokenTheme.createFromParsedTokenTheme([
new ParsedTokenThemeRule('var', -1, FontStyle.NotSet, 'F8F8F2', null)
], [
'000000', 'FFFFFF', '0F0F0F'
]);
let colorMap = new ColorMap();
colorMap.getId('000000');
colorMap.getId('FFFFFF');
colorMap.getId('0F0F0F');
colorMap.getId('F8F8F2');
assert.deepEqual(actual.getColorMap(), colorMap.getColorMap());
});
});

9
src/vs/editor/test/common/services/languagesRegistry.test.ts
View File

@@ -6,6 +6,7 @@
import * as assert from 'assert';
import { LanguagesRegistry } from 'vs/editor/common/services/languagesRegistry';
import URI from 'vs/base/common/uri';
suite('LanguagesRegistry', () => {
@@ -250,19 +251,19 @@ suite('LanguagesRegistry', () => {
registry._registerLanguages([{
id: 'a',
aliases: ['aName'],
configuration: 'aFilename'
configuration: URI.file('/path/to/aFilename')
}]);
assert.deepEqual(registry.getConfigurationFiles('a'), ['aFilename']);
assert.deepEqual(registry.getConfigurationFiles('a'), [URI.file('/path/to/aFilename')]);
assert.deepEqual(registry.getConfigurationFiles('aname'), []);
assert.deepEqual(registry.getConfigurationFiles('aName'), []);
registry._registerLanguages([{
id: 'a',
configuration: 'aFilename2'
configuration: URI.file('/path/to/aFilename2')
}]);
assert.deepEqual(registry.getConfigurationFiles('a'), ['aFilename', 'aFilename2']);
assert.deepEqual(registry.getConfigurationFiles('a'), [URI.file('/path/to/aFilename'), URI.file('/path/to/aFilename2')]);
assert.deepEqual(registry.getConfigurationFiles('aname'), []);
assert.deepEqual(registry.getConfigurationFiles('aName'), []);
});

2
src/vs/editor/test/common/view/minimapCharRendererFactory.ts
View File

@@ -27,7 +27,7 @@ export class MinimapCharRendererFactory {
let newLength = charData.length / 2;
let result = new Uint8ClampedArray(newLength);
let sourceOffset = 0;
for (var i = 0; i < newLength; i++) {
for (let i = 0; i < newLength; i++) {
let color = charData[sourceOffset];
let alpha = charData[sourceOffset + 1];
let newColor = Math.round((color * alpha) / 255);

4
src/vs/editor/test/common/viewLayout/lineDecorations.test.ts
View File

@@ -13,7 +13,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
test('Bug 9827:Overlapping inline decorations can cause wrong inline class to be applied', () => {
var result = LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
let result = LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
new LineDecoration(1, 11, 'c1', InlineDecorationType.Regular),
new LineDecoration(3, 4, 'c2', InlineDecorationType.Regular)
]);
@@ -27,7 +27,7 @@ suite('Editor ViewLayout - ViewLineParts', () => {
test('issue #3462: no whitespace shown at the end of a decorated line', () => {
var result = LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
let result = LineDecorationsNormalizer.normalize('abcabcabcabcabcabcabcabcabcabc', [
new LineDecoration(15, 21, 'vs-whitespace', InlineDecorationType.Regular),
new LineDecoration(20, 21, 'inline-folded', InlineDecorationType.Regular),
]);

44
src/vs/editor/test/common/viewLayout/linesLayout.test.ts
View File

@@ -12,7 +12,7 @@ suite('Editor ViewLayout - LinesLayout', () => {
test('LinesLayout 1', () => {
// Start off with 10 lines
var linesLayout = new LinesLayout(10, 10);
let linesLayout = new LinesLayout(10, 10);
// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
// whitespace: -
@@ -41,7 +41,7 @@ suite('Editor ViewLayout - LinesLayout', () => {
assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(29), 3);
// Add whitespace of height 5px after 2nd line
linesLayout.insertWhitespace(2, 0, 5);
linesLayout.insertWhitespace(2, 0, 5, 0);
// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
// whitespace: a(2,5)
assert.equal(linesLayout.getLinesTotalHeight(), 105);
@@ -65,8 +65,8 @@ suite('Editor ViewLayout - LinesLayout', () => {
assert.equal(linesLayout.getLineNumberAtOrAfterVerticalOffset(105), 10);
// Add two more whitespaces of height 5px
linesLayout.insertWhitespace(3, 0, 5);
linesLayout.insertWhitespace(4, 0, 5);
linesLayout.insertWhitespace(3, 0, 5, 0);
linesLayout.insertWhitespace(4, 0, 5, 0);
// lines: [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
// whitespace: a(2,5), b(3, 5), c(4, 5)
assert.equal(linesLayout.getLinesTotalHeight(), 115);
@@ -121,8 +121,8 @@ suite('Editor ViewLayout - LinesLayout', () => {
test('LinesLayout 2', () => {
// Start off with 10 lines and one whitespace after line 2, of height 5
var linesLayout = new LinesLayout(10, 1);
var a = linesLayout.insertWhitespace(2, 0, 5);
let linesLayout = new LinesLayout(10, 1);
let a = linesLayout.insertWhitespace(2, 0, 5, 0);
// 10 lines
// whitespace: - a(2,5)
@@ -217,8 +217,8 @@ suite('Editor ViewLayout - LinesLayout', () => {
});
test('LinesLayout getLineNumberAtOrAfterVerticalOffset', () => {
var linesLayout = new LinesLayout(10, 1);
linesLayout.insertWhitespace(6, 0, 10);
let linesLayout = new LinesLayout(10, 1);
linesLayout.insertWhitespace(6, 0, 10, 0);
// 10 lines
// whitespace: - a(6,10)
@@ -266,8 +266,8 @@ suite('Editor ViewLayout - LinesLayout', () => {
});
test('LinesLayout getCenteredLineInViewport', () => {
var linesLayout = new LinesLayout(10, 1);
linesLayout.insertWhitespace(6, 0, 10);
let linesLayout = new LinesLayout(10, 1);
linesLayout.insertWhitespace(6, 0, 10, 0);
// 10 lines
// whitespace: - a(6,10)
@@ -349,8 +349,8 @@ suite('Editor ViewLayout - LinesLayout', () => {
});
test('LinesLayout getLinesViewportData 1', () => {
var linesLayout = new LinesLayout(10, 10);
linesLayout.insertWhitespace(6, 0, 100);
let linesLayout = new LinesLayout(10, 10);
linesLayout.insertWhitespace(6, 0, 100, 0);
// 10 lines
// whitespace: - a(6,100)
@@ -367,7 +367,7 @@ suite('Editor ViewLayout - LinesLayout', () => {
assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 190);
// viewport 0->50
var viewportData = linesLayout.getLinesViewportData(0, 50);
let viewportData = linesLayout.getLinesViewportData(0, 50);
assert.equal(viewportData.startLineNumber, 1);
assert.equal(viewportData.endLineNumber, 5);
assert.equal(viewportData.completelyVisibleStartLineNumber, 1);
@@ -483,9 +483,9 @@ suite('Editor ViewLayout - LinesLayout', () => {
test('LinesLayout getLinesViewportData 2 & getWhitespaceViewportData', () => {
var linesLayout = new LinesLayout(10, 10);
var a = linesLayout.insertWhitespace(6, 0, 100);
var b = linesLayout.insertWhitespace(7, 0, 50);
let linesLayout = new LinesLayout(10, 10);
let a = linesLayout.insertWhitespace(6, 0, 100, 0);
let b = linesLayout.insertWhitespace(7, 0, 50, 0);
// 10 lines
// whitespace: - a(6,100), b(7, 50)
@@ -502,13 +502,13 @@ suite('Editor ViewLayout - LinesLayout', () => {
assert.equal(linesLayout.getVerticalOffsetForLineNumber(10), 240);
// viewport 50->160
var viewportData = linesLayout.getLinesViewportData(50, 160);
let viewportData = linesLayout.getLinesViewportData(50, 160);
assert.equal(viewportData.startLineNumber, 6);
assert.equal(viewportData.endLineNumber, 6);
assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
var whitespaceData = linesLayout.getWhitespaceViewportData(50, 160);
let whitespaceData = linesLayout.getWhitespaceViewportData(50, 160);
assert.deepEqual(whitespaceData, [{
id: a,
afterLineNumber: 6,
@@ -554,11 +554,11 @@ suite('Editor ViewLayout - LinesLayout', () => {
});
test('LinesLayout getWhitespaceAtVerticalOffset', () => {
var linesLayout = new LinesLayout(10, 10);
var a = linesLayout.insertWhitespace(6, 0, 100);
var b = linesLayout.insertWhitespace(7, 0, 50);
let linesLayout = new LinesLayout(10, 10);
let a = linesLayout.insertWhitespace(6, 0, 100, 0);
let b = linesLayout.insertWhitespace(7, 0, 50, 0);
var whitespace = linesLayout.getWhitespaceAtVerticalOffset(0);
let whitespace = linesLayout.getWhitespaceAtVerticalOffset(0);
assert.equal(whitespace, null);
whitespace = linesLayout.getWhitespaceAtVerticalOffset(59);

65
src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
View File

@@ -30,6 +30,7 @@ suite('viewLineRenderer.renderLine', () => {
let _actual = renderViewLine(new RenderLineInput(
false,
lineContent,
false,
strings.isBasicASCII(lineContent),
false,
0,
@@ -77,6 +78,7 @@ suite('viewLineRenderer.renderLine', () => {
let _actual = renderViewLine(new RenderLineInput(
false,
lineContent,
false,
true,
false,
0,
@@ -114,6 +116,7 @@ suite('viewLineRenderer.renderLine', () => {
let _actual = renderViewLine(new RenderLineInput(
false,
'Hello world!',
false,
true,
false,
0,
@@ -216,6 +219,7 @@ suite('viewLineRenderer.renderLine', () => {
let _actual = renderViewLine(new RenderLineInput(
false,
lineText,
false,
true,
false,
0,
@@ -276,6 +280,7 @@ suite('viewLineRenderer.renderLine', () => {
let _actual = renderViewLine(new RenderLineInput(
false,
lineText,
false,
true,
false,
0,
@@ -336,6 +341,7 @@ suite('viewLineRenderer.renderLine', () => {
let _actual = renderViewLine(new RenderLineInput(
false,
lineText,
false,
true,
false,
0,
@@ -374,6 +380,7 @@ suite('viewLineRenderer.renderLine', () => {
false,
lineText,
false,
false,
true,
0,
lineParts,
@@ -401,6 +408,7 @@ suite('viewLineRenderer.renderLine', () => {
let actual = renderViewLine(new RenderLineInput(
false,
lineText,
false,
true,
false,
0,
@@ -499,6 +507,7 @@ suite('viewLineRenderer.renderLine', () => {
let actual = renderViewLine(new RenderLineInput(
false,
lineText,
false,
true,
false,
0,
@@ -535,6 +544,7 @@ suite('viewLineRenderer.renderLine', () => {
lineText,
false,
false,
false,
0,
lineParts,
[],
@@ -561,6 +571,7 @@ suite('viewLineRenderer.renderLine', () => {
false,
lineText,
false,
false,
true,
0,
lineParts,
@@ -604,6 +615,7 @@ suite('viewLineRenderer.renderLine', () => {
let _actual = renderViewLine(new RenderLineInput(
true,
lineText,
false,
true,
false,
4,
@@ -685,6 +697,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
fontIsMonospace,
lineContent,
false,
true,
false,
fauxIndentLength,
@@ -708,6 +721,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
false,
lineContent,
false,
true,
false,
0,
@@ -737,6 +751,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
true,
lineContent,
false,
true,
false,
0,
@@ -891,9 +906,9 @@ suite('viewLineRenderer.renderLine 2', () => {
'<span class="vs-whitespace" style="width:20px">\u00b7\u00b7</span>',
'<span class="mtk2">He</span>',
'<span class="mtk3">llo\u00a0world!</span>',
'<span class="vs-whitespace" style="width:20px">\u00b7\u2192</span>',
'<span class="vs-whitespace" style="width:20px">\u00b7\uffeb</span>',
'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u2192\u00a0</span>',
'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u00b7\u2192</span>',
'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u00b7\uffeb</span>',
'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u00b7\u00b7</span>',
'</span>',
].join('')
@@ -917,9 +932,9 @@ suite('viewLineRenderer.renderLine 2', () => {
'<span class="vs-whitespace" style="width:20px">\u00b7\u00b7</span>',
'<span class="mtk2">He</span>',
'<span class="mtk3">llo\u00a0world!</span>',
'<span class="vs-whitespace" style="width:20px">\u00b7\u2192</span>',
'<span class="vs-whitespace" style="width:20px">\u00b7\uffeb</span>',
'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u2192\u00a0</span>',
'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u00b7\u2192</span>',
'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u00b7\uffeb</span>',
'<span class="vs-whitespace" style="width:40px">\u00b7\u00b7\u00b7\u00b7</span>',
'</span>',
].join('')
@@ -943,7 +958,7 @@ suite('viewLineRenderer.renderLine 2', () => {
'<span class="vs-whitespace">\u00b7\u00b7</span>',
'<span class="mtk2">He</span>',
'<span class="mtk3">llo\u00a0world!</span>',
'<span class="vs-whitespace">\u00b7\u2192\u00b7\u00b7\u2192\u00a0\u00b7\u00b7\u00b7\u2192\u00b7\u00b7\u00b7\u00b7</span>',
'<span class="vs-whitespace">\u00b7\uffeb\u00b7\u00b7\u2192\u00a0\u00b7\u00b7\u00b7\uffeb\u00b7\u00b7\u00b7\u00b7</span>',
'</span>',
].join('')
);
@@ -1002,6 +1017,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
false,
'Hello world',
false,
true,
false,
0,
@@ -1044,6 +1060,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
false,
lineContent,
false,
true,
false,
0,
@@ -1074,6 +1091,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
false,
lineContent,
false,
true,
false,
0,
@@ -1105,6 +1123,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
false,
lineContent,
false,
true,
false,
0,
@@ -1134,6 +1153,7 @@ suite('viewLineRenderer.renderLine 2', () => {
' 1. 🙏',
false,
false,
false,
0,
createViewLineTokens([createPart(7, 3)]),
[new LineDecoration(7, 8, 'inline-folded', InlineDecorationType.After)],
@@ -1160,6 +1180,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
true,
'',
false,
true,
false,
0,
@@ -1190,6 +1211,7 @@ suite('viewLineRenderer.renderLine 2', () => {
let actual = renderViewLine(new RenderLineInput(
true,
'\t}',
false,
true,
false,
0,
@@ -1223,6 +1245,7 @@ suite('viewLineRenderer.renderLine 2', () => {
'asd = "擦"\t\t#asd',
false,
false,
false,
0,
createViewLineTokens([createPart(15, 3)]),
[],
@@ -1250,6 +1273,7 @@ suite('viewLineRenderer.renderLine 2', () => {
'asd = "擦"\t\t#asd',
false,
false,
false,
0,
createViewLineTokens([createPart(15, 3)]),
[],
@@ -1283,6 +1307,7 @@ suite('viewLineRenderer.renderLine 2', () => {
'12345689012345678901234568901234567890123456890abába',
false,
false,
false,
0,
createViewLineTokens([createPart(53, 3)]),
[],
@@ -1310,6 +1335,7 @@ suite('viewLineRenderer.renderLine 2', () => {
' JoyShareல் பின்தொடர்ந்து, விடீயோ, ஜோக்குகள், அனிமேசன், நகைச்சுவை படங்கள் மற்றும் செய்திகளை பெறுவீர்',
false,
false,
false,
0,
createViewLineTokens([createPart(100, 3)]),
[],
@@ -1341,6 +1367,7 @@ suite('viewLineRenderer.renderLine 2', () => {
' वो ऐसा क्या है जो हमारे अंदर भी है और बाहर भी है। जिसकी वजह से हम सब हैं। जिसने इस सृष्टि की रचना की है।',
false,
false,
false,
0,
createViewLineTokens([createPart(105, 3)]),
[],
@@ -1361,10 +1388,38 @@ suite('viewLineRenderer.renderLine 2', () => {
assert.deepEqual(actual.html, expected);
});
test('issue #38123: editor.renderWhitespace: "boundary" renders whitespace at line wrap point when line is wrapped', () => {
let actual = renderViewLine(new RenderLineInput(
true,
'This is a long line which never uses more than two spaces. ',
true,
true,
false,
0,
createViewLineTokens([createPart(59, 3)]),
[],
4,
10,
10000,
'boundary',
false,
false
));
let expected = [
'<span>',
'<span class="mtk3">This\u00a0is\u00a0a\u00a0long\u00a0line\u00a0which\u00a0never\u00a0uses\u00a0more\u00a0than\u00a0two</span><span class="mtk3">\u00a0spaces.</span><span class="mtk3">\u00a0</span>',
'</span>'
].join('');
assert.deepEqual(actual.html, expected);
});
function createTestGetColumnOfLinePartOffset(lineContent: string, tabSize: number, parts: ViewLineToken[], expectedPartLengths: number[]): (partIndex: number, partLength: number, offset: number, expected: number) => void {
let renderLineOutput = renderViewLine(new RenderLineInput(
false,
lineContent,
false,
true,
false,
0,

48
src/vs/editor/test/common/viewLayout/whitespaceComputer.test.ts
View File

@@ -11,10 +11,10 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
test('WhitespaceComputer', () => {
var whitespaceComputer = new WhitespaceComputer();
let whitespaceComputer = new WhitespaceComputer();
// Insert a whitespace after line number 2, of height 10
var a = whitespaceComputer.insertWhitespace(2, 0, 10);
let a = whitespaceComputer.insertWhitespace(2, 0, 10, 0);
// whitespaces: a(2, 10)
assert.equal(whitespaceComputer.getCount(), 1);
assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 2);
@@ -27,7 +27,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(4), 10);
// Insert a whitespace again after line number 2, of height 20
var b = whitespaceComputer.insertWhitespace(2, 0, 20);
let b = whitespaceComputer.insertWhitespace(2, 0, 20, 0);
// whitespaces: a(2, 10), b(2, 20)
assert.equal(whitespaceComputer.getCount(), 2);
assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 2);
@@ -72,7 +72,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(4), 10);
// Add a whitespace before the first line of height 50
b = whitespaceComputer.insertWhitespace(0, 0, 50);
b = whitespaceComputer.insertWhitespace(0, 0, 50, 0);
// whitespaces: b(0, 50), a(2, 10)
assert.equal(whitespaceComputer.getCount(), 2);
assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 0);
@@ -88,7 +88,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(4), 60);
// Add a whitespace after line 4 of height 20
whitespaceComputer.insertWhitespace(4, 0, 20);
whitespaceComputer.insertWhitespace(4, 0, 20, 0);
// whitespaces: b(0, 50), a(2, 10), c(4, 20)
assert.equal(whitespaceComputer.getCount(), 3);
assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 0);
@@ -108,7 +108,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
assert.equal(whitespaceComputer.getAccumulatedHeightBeforeLineNumber(5), 80);
// Add a whitespace after line 3 of height 30
whitespaceComputer.insertWhitespace(3, 0, 30);
whitespaceComputer.insertWhitespace(3, 0, 30, 0);
// whitespaces: b(0, 50), a(2, 10), d(3, 30), c(4, 20)
assert.equal(whitespaceComputer.getCount(), 4);
assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 0);
@@ -244,16 +244,16 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
test('WhitespaceComputer findInsertionIndex', () => {
var makeArray = (size: number, fillValue: number) => {
var r: number[] = [];
for (var i = 0; i < size; i++) {
let makeArray = (size: number, fillValue: number) => {
let r: number[] = [];
for (let i = 0; i < size; i++) {
r[i] = fillValue;
}
return r;
};
var arr: number[];
var ordinals: number[];
let arr: number[];
let ordinals: number[];
arr = [];
ordinals = makeArray(arr.length, 0);
@@ -377,11 +377,11 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
});
test('WhitespaceComputer changeWhitespaceAfterLineNumber & getFirstWhitespaceIndexAfterLineNumber', () => {
var whitespaceComputer = new WhitespaceComputer();
let whitespaceComputer = new WhitespaceComputer();
var a = whitespaceComputer.insertWhitespace(0, 0, 1);
var b = whitespaceComputer.insertWhitespace(7, 0, 1);
var c = whitespaceComputer.insertWhitespace(3, 0, 1);
let a = whitespaceComputer.insertWhitespace(0, 0, 1, 0);
let b = whitespaceComputer.insertWhitespace(7, 0, 1, 0);
let c = whitespaceComputer.insertWhitespace(3, 0, 1, 0);
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(0), a); // 0
assert.equal(whitespaceComputer.getAfterLineNumberForWhitespaceIndex(0), 0);
@@ -502,34 +502,34 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
test('WhitespaceComputer Bug', () => {
var whitespaceComputer = new WhitespaceComputer();
let whitespaceComputer = new WhitespaceComputer();
var a = whitespaceComputer.insertWhitespace(0, 0, 1);
var b = whitespaceComputer.insertWhitespace(7, 0, 1);
let a = whitespaceComputer.insertWhitespace(0, 0, 1, 0);
let b = whitespaceComputer.insertWhitespace(7, 0, 1, 0);
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(0), a); // 0
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(1), b); // 7
var c = whitespaceComputer.insertWhitespace(3, 0, 1);
let c = whitespaceComputer.insertWhitespace(3, 0, 1, 0);
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(0), a); // 0
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(1), c); // 3
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(2), b); // 7
var d = whitespaceComputer.insertWhitespace(2, 0, 1);
let d = whitespaceComputer.insertWhitespace(2, 0, 1, 0);
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(0), a); // 0
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(1), d); // 2
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(2), c); // 3
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(3), b); // 7
var e = whitespaceComputer.insertWhitespace(8, 0, 1);
let e = whitespaceComputer.insertWhitespace(8, 0, 1, 0);
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(0), a); // 0
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(1), d); // 2
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(2), c); // 3
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(3), b); // 7
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(4), e); // 8
var f = whitespaceComputer.insertWhitespace(11, 0, 1);
let f = whitespaceComputer.insertWhitespace(11, 0, 1, 0);
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(0), a); // 0
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(1), d); // 2
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(2), c); // 3
@@ -537,7 +537,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(4), e); // 8
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(5), f); // 11
var g = whitespaceComputer.insertWhitespace(10, 0, 1);
let g = whitespaceComputer.insertWhitespace(10, 0, 1, 0);
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(0), a); // 0
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(1), d); // 2
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(2), c); // 3
@@ -546,7 +546,7 @@ suite('Editor ViewLayout - WhitespaceComputer', () => {
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(5), g); // 10
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(6), f); // 11
var h = whitespaceComputer.insertWhitespace(0, 0, 1);
let h = whitespaceComputer.insertWhitespace(0, 0, 1, 0);
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(0), a); // 0
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(1), h); // 0
assert.equal(whitespaceComputer.getIdForWhitespaceIndex(2), d); // 2

9
src/vs/editor/test/common/viewModel/characterHardWrappingLineMapper.test.ts
View File

@@ -10,7 +10,7 @@ import { CharacterHardWrappingLineMapperFactory } from 'vs/editor/common/viewMod
import { ILineMapperFactory, ILineMapping } from 'vs/editor/common/viewModel/splitLinesCollection';
function assertLineMapping(factory: ILineMapperFactory, tabSize: number, breakAfter: number, annotatedText: string, wrappingIndent = WrappingIndent.None): ILineMapping {
// Create version of `annotatedText` with line break markers removed
let rawText = '';
let currentLineIndex = 0;
let lineIndices: number[] = [];
@@ -25,6 +25,7 @@ function assertLineMapping(factory: ILineMapperFactory, tabSize: number, breakAf
let mapper = factory.createLineMapping(rawText, tabSize, breakAfter, 2, wrappingIndent);
// Insert line break markers again, according to algorithm
let actualAnnotatedText = '';
if (mapper) {
let previousLineIndex = 0;
@@ -114,4 +115,10 @@ suite('Editor ViewModel - CharacterHardWrappingLineMapper', () => {
let mapper = assertLineMapping(factory, 4, 24, ' t h i s |i s |a l |o n |g l |i n |e', WrappingIndent.Indent);
assert.equal(mapper.getWrappedLinesIndent(), ' \t');
});
test('CharacterHardWrappingLineMapper - WrappingIndent.DeepIndent', () => {
let factory = new CharacterHardWrappingLineMapperFactory('', ' ', '');
let mapper = assertLineMapping(factory, 4, 26, ' W e A r e T e s t |i n g D e |e p I n d |e n t a t |i o n', WrappingIndent.DeepIndent);
assert.equal(mapper.getWrappedLinesIndent(), ' \t\t');
});
});

2
src/vs/editor/test/common/viewModel/prefixSumComputer.test.ts
View File

@@ -13,7 +13,7 @@ suite('Editor ViewModel - PrefixSumComputer', () => {
test('PrefixSumComputer', () => {
let indexOfResult: PrefixSumIndexOfResult;
var psc = new PrefixSumComputer(toUint32Array([1, 1, 2, 1, 3]));
let psc = new PrefixSumComputer(toUint32Array([1, 1, 2, 1, 3]));
assert.equal(psc.getTotalValue(), 8);
assert.equal(psc.getAccumulatedValue(-1), 0);
assert.equal(psc.getAccumulatedValue(0), 1);

10
src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
View File

@@ -23,8 +23,8 @@ import { EndOfLinePreference } from 'vs/editor/common/model';
suite('Editor ViewModel - SplitLinesCollection', () => {
test('SplitLine', () => {
var model1 = createModel('My First LineMy Second LineAnd another one');
var line1 = createSplitLine([13, 14, 15], '');
let model1 = createModel('My First LineMy Second LineAnd another one');
let line1 = createSplitLine([13, 14, 15], '');
assert.equal(line1.getViewLineCount(), 3);
assert.equal(line1.getViewLineContent(model1, 1, 0), 'My First Line');
@@ -229,12 +229,12 @@ suite('Editor ViewModel - SplitLinesCollection', () => {
if (viewLineNumber < 1) {
viewLineNumber = 1;
}
var lineCount = linesCollection.getViewLineCount();
let lineCount = linesCollection.getViewLineCount();
if (viewLineNumber > lineCount) {
viewLineNumber = lineCount;
}
var viewMinColumn = linesCollection.getViewLineMinColumn(viewLineNumber);
var viewMaxColumn = linesCollection.getViewLineMaxColumn(viewLineNumber);
let viewMinColumn = linesCollection.getViewLineMinColumn(viewLineNumber);
let viewMaxColumn = linesCollection.getViewLineMaxColumn(viewLineNumber);
if (viewColumn < viewMinColumn) {
viewColumn = viewMinColumn;
}