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

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vs/editor/contrib/codelens/codelensWidget.ts
View File

@@ -26,7 +26,7 @@ class CodeLensViewZone implements editorBrowser.IViewZone {
afterLineNumber: number;
private _lastHeight: number;
private _onHeight: Function;
private readonly _onHeight: Function;
constructor(afterLineNumber: number, onHeight: Function) {
this.afterLineNumber = afterLineNumber;
@@ -99,7 +99,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
this._commands = Object.create(null);
const symbols = coalesce(inSymbols);
if (isFalsyOrEmpty(symbols)) {
this._domNode.innerHTML = 'no commands';
this._domNode.innerHTML = '<span>no commands</span>';
return;
}
@@ -164,9 +164,9 @@ export interface IDecorationIdCallback {
export class CodeLensHelper {
private _removeDecorations: string[];
private _addDecorations: IModelDeltaDecoration[];
private _addDecorationsCallbacks: IDecorationIdCallback[];
private readonly _removeDecorations: string[];
private readonly _addDecorations: IModelDeltaDecoration[];
private readonly _addDecorationsCallbacks: IDecorationIdCallback[];
constructor() {
this._removeDecorations = [];
@@ -290,6 +290,13 @@ export class CodeLens {
updateCommands(symbols: Array<ICodeLensSymbol | undefined | null>): void {
this._contentWidget.withCommands(symbols);
for (let i = 0; i < this._data.length; i++) {
const resolved = symbols[i];
if (resolved) {
const { symbol } = this._data[i];
symbol.command = resolved.command || symbol.command;
}
}
}
updateHeight(): void {