mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-15 10:58:31 -05:00
Merge VS Code 1.31.1 (#4283)
This commit is contained in:
@@ -11,7 +11,7 @@ import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
|
||||
|
||||
suite('PieceTreeTextBuffer._getInverseEdits', () => {
|
||||
|
||||
function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text: string[]): IValidatedEditOperation {
|
||||
function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text: string[] | null): IValidatedEditOperation {
|
||||
return {
|
||||
sortIndex: 0,
|
||||
identifier: null,
|
||||
@@ -262,7 +262,7 @@ suite('PieceTreeTextBuffer._getInverseEdits', () => {
|
||||
|
||||
suite('PieceTreeTextBuffer._toSingleEditOperation', () => {
|
||||
|
||||
function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, rangeOffset: number, rangeLength: number, text: string[]): IValidatedEditOperation {
|
||||
function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, rangeOffset: number, rangeLength: number, text: string[] | null): IValidatedEditOperation {
|
||||
return {
|
||||
sortIndex: 0,
|
||||
identifier: null,
|
||||
|
||||
@@ -33,8 +33,8 @@ export function getRandomString(minLength: number, maxLength: number): string {
|
||||
|
||||
export function generateRandomEdits(chunks: string[], editCnt: number): IIdentifiedSingleEditOperation[] {
|
||||
let lines: string[] = [];
|
||||
for (let i = 0; i < chunks.length; i++) {
|
||||
let newLines = chunks[i].split(/\r\n|\r|\n/);
|
||||
for (const chunk of chunks) {
|
||||
let newLines = chunk.split(/\r\n|\r|\n/);
|
||||
if (lines.length === 0) {
|
||||
lines.push(...newLines);
|
||||
} else {
|
||||
@@ -50,7 +50,7 @@ export function generateRandomEdits(chunks: string[], editCnt: number): IIdentif
|
||||
let startColumn = getRandomInt(1, Math.max(lines[line - 1].length, 1));
|
||||
let endColumn = getRandomInt(startColumn, Math.max(lines[line - 1].length, startColumn));
|
||||
let text: string = '';
|
||||
if (Math.random() < .5) {
|
||||
if (Math.random() < 0.5) {
|
||||
text = getRandomString(5, 10);
|
||||
}
|
||||
|
||||
@@ -66,8 +66,8 @@ export function generateRandomEdits(chunks: string[], editCnt: number): IIdentif
|
||||
|
||||
export function generateSequentialInserts(chunks: string[], editCnt: number): IIdentifiedSingleEditOperation[] {
|
||||
let lines: string[] = [];
|
||||
for (let i = 0; i < chunks.length; i++) {
|
||||
let newLines = chunks[i].split(/\r\n|\r|\n/);
|
||||
for (const chunk of chunks) {
|
||||
let newLines = chunk.split(/\r\n|\r|\n/);
|
||||
if (lines.length === 0) {
|
||||
lines.push(...newLines);
|
||||
} else {
|
||||
@@ -82,7 +82,7 @@ export function generateSequentialInserts(chunks: string[], editCnt: number): II
|
||||
let line = lines.length;
|
||||
let column = lines[line - 1].length + 1;
|
||||
let text: string = '';
|
||||
if (Math.random() < .5) {
|
||||
if (Math.random() < 0.5) {
|
||||
text = '\n';
|
||||
lines.push('');
|
||||
} else {
|
||||
@@ -101,8 +101,8 @@ export function generateSequentialInserts(chunks: string[], editCnt: number): II
|
||||
|
||||
export function generateRandomReplaces(chunks: string[], editCnt: number, searchStringLen: number, replaceStringLen: number): IIdentifiedSingleEditOperation[] {
|
||||
let lines: string[] = [];
|
||||
for (let i = 0; i < chunks.length; i++) {
|
||||
let newLines = chunks[i].split(/\r\n|\r|\n/);
|
||||
for (const chunk of chunks) {
|
||||
let newLines = chunk.split(/\r\n|\r|\n/);
|
||||
if (lines.length === 0) {
|
||||
lines.push(...newLines);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user