mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 02:48:30 -05:00
Merge from master
This commit is contained in:
@@ -2,12 +2,11 @@
|
||||
* 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 { CursorContext, CursorState, PartialCursorState } from 'vs/editor/common/controller/cursorCommon';
|
||||
import { OneCursor } from 'vs/editor/common/controller/oneCursor';
|
||||
import { Selection, ISelection } from 'vs/editor/common/core/selection';
|
||||
import { Position } from 'vs/editor/common/core/position';
|
||||
import { CursorState, CursorContext } from 'vs/editor/common/controller/cursorCommon';
|
||||
import { ISelection, Selection } from 'vs/editor/common/core/selection';
|
||||
|
||||
export class CursorCollection {
|
||||
|
||||
@@ -109,7 +108,7 @@ export class CursorCollection {
|
||||
return this.primaryCursor.asCursorState();
|
||||
}
|
||||
|
||||
public setStates(states: CursorState[]): void {
|
||||
public setStates(states: PartialCursorState[] | null): void {
|
||||
if (states === null) {
|
||||
return;
|
||||
}
|
||||
@@ -120,7 +119,7 @@ export class CursorCollection {
|
||||
/**
|
||||
* Creates or disposes secondary cursors as necessary to match the number of `secondarySelections`.
|
||||
*/
|
||||
private _setSecondaryStates(secondaryStates: CursorState[]): void {
|
||||
private _setSecondaryStates(secondaryStates: PartialCursorState[]): void {
|
||||
const secondaryCursorsLength = this.secondaryCursors.length;
|
||||
const secondaryStatesLength = secondaryStates.length;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user