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

Merge VS Code 1.21 source code (#1067)

Browse Source 
* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms
This commit is contained in:
Karl Burtram
2018-04-04 15:27:51 -07:00
committed by GitHub
parent 5fba3e31b4
commit dafb780987
9412 changed files with 141255 additions and 98813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/vs/editor/common/viewModel/viewModel.ts
View File

@@ -4,11 +4,12 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { INewScrollPosition, EndOfLinePreference, IViewState, IModelDecorationOptions } from 'vs/editor/common/editorCommon';
import { ViewLineToken } from 'vs/editor/common/core/viewLineToken';
import { INewScrollPosition, IViewState } from 'vs/editor/common/editorCommon';
import { EndOfLinePreference, IModelDecorationOptions } from 'vs/editor/common/model';
import { IViewLineTokens } from 'vs/editor/common/core/lineTokens';
import { Position, IPosition } from 'vs/editor/common/core/position';
import { Range } from 'vs/editor/common/core/range';
import { ViewEvent, IViewEventListener } from 'vs/editor/common/view/viewEvents';
import { IViewEventListener } from 'vs/editor/common/view/viewEvents';
import { IDisposable } from 'vs/base/common/lifecycle';
import { Scrollable, IScrollPosition } from 'vs/base/common/scrollable';
import { IPartialViewLinesViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
@@ -63,7 +64,7 @@ export interface IViewLayout {
getWhitespaces(): IEditorWhitespace[];
saveState(): IViewState;
restoreState(state: IViewState): void;
reduceRestoreState(state: IViewState): { scrollLeft: number; scrollTop: number; };
isAfterLines(verticalOffset: number): boolean;
getLineNumberAtVerticalOffset(verticalOffset: number): number;
@@ -144,7 +145,8 @@ export interface IViewModel {
validateModelPosition(modelPosition: IPosition): Position;
deduceModelPositionRelativeToViewPosition(viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position;
getPlainTextToCopy(ranges: Range[], emptySelectionClipboard: boolean): string;
getEOL(): string;
getPlainTextToCopy(ranges: Range[], emptySelectionClipboard: boolean): string | string[];
getHTMLToCopy(ranges: Range[], emptySelectionClipboard: boolean): string;
}
@@ -179,13 +181,13 @@ export class ViewLineData {
/**
* The tokens at this view line.
*/
public readonly tokens: ViewLineToken[];
public readonly tokens: IViewLineTokens;
constructor(
content: string,
minColumn: number,
maxColumn: number,
tokens: ViewLineToken[]
tokens: IViewLineTokens
) {
this.content = content;
this.minColumn = minColumn;
@@ -218,7 +220,7 @@ export class ViewLineRenderingData {
/**
* The tokens at this view line.
*/
public readonly tokens: ViewLineToken[];
public readonly tokens: IViewLineTokens;
/**
* Inline decorations at this view line.
*/
@@ -234,7 +236,7 @@ export class ViewLineRenderingData {
content: string,
mightContainRTL: boolean,
mightContainNonBasicASCII: boolean,
tokens: ViewLineToken[],
tokens: IViewLineTokens,
inlineDecorations: InlineDecoration[],
tabSize: number
) {
@@ -285,25 +287,3 @@ export class ViewModelDecoration {
export interface IOverviewRulerDecorations {
[color: string]: number[];
}
export class ViewEventsCollector {
private _events: ViewEvent[];
private _eventsLen = 0;
constructor() {
this._events = [];
this._eventsLen = 0;
}
public emit(event: ViewEvent) {
this._events[this._eventsLen++] = event;
}
public finalize(): ViewEvent[] {
let result = this._events;
this._events = null;
return result;
}
}