ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-06 17:23:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/editor/common/diff/diffComputer.ts
View File

@@ -2,7 +2,6 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import { IDiffChange, ISequence, LcsDiff } from 'vs/base/common/diff/diff';
import * as strings from 'vs/base/common/strings';
@@ -239,14 +238,14 @@ class LineChange implements ILineChange {
public originalEndLineNumber: number;
public modifiedStartLineNumber: number;
public modifiedEndLineNumber: number;
public charChanges: CharChange[];
public charChanges: CharChange[] | undefined;
constructor(
originalStartLineNumber: number,
originalEndLineNumber: number,
modifiedStartLineNumber: number,
modifiedEndLineNumber: number,
charChanges: CharChange[]
charChanges: CharChange[] | undefined
) {
this.originalStartLineNumber = originalStartLineNumber;
this.originalEndLineNumber = originalEndLineNumber;
@@ -260,7 +259,7 @@ class LineChange implements ILineChange {
let originalEndLineNumber: number;
let modifiedStartLineNumber: number;
let modifiedEndLineNumber: number;
let charChanges: CharChange[];
let charChanges: CharChange[] | undefined = undefined;
if (diffChange.originalLength === 0) {
originalStartLineNumber = originalLineSequence.getStartLineNumber(diffChange.originalStart) - 1;
@@ -478,7 +477,7 @@ export class DiffComputer {
return;
}
let charChanges: CharChange[];
let charChanges: CharChange[] | undefined = undefined;
if (this.shouldComputeCharChanges) {
charChanges = [new CharChange(
originalLineNumber, originalStartColumn, originalLineNumber, originalEndColumn,
@@ -513,7 +512,7 @@ export class DiffComputer {
prevChange.originalEndLineNumber = originalLineNumber;
prevChange.modifiedEndLineNumber = modifiedLineNumber;
if (this.shouldComputeCharChanges) {
prevChange.charChanges.push(new CharChange(
prevChange.charChanges!.push(new CharChange(
originalLineNumber, originalStartColumn, originalLineNumber, originalEndColumn,
modifiedLineNumber, modifiedStartColumn, modifiedLineNumber, modifiedEndColumn
));