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

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

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

@@ -7,20 +7,19 @@
import 'vs/css!./codelensWidget';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import Severity from 'vs/base/common/severity';
import { format, escape } from 'vs/base/common/strings';
import * as dom from 'vs/base/browser/dom';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { IMessageService } from 'vs/platform/message/common/message';
import { Range } from 'vs/editor/common/core/range';
import * as editorCommon from 'vs/editor/common/editorCommon';
import { ICodeLensSymbol, Command } from 'vs/editor/common/modes';
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
import { ICodeLensData } from './codelens';
import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations';
import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
import { editorCodeLensForeground } from 'vs/editor/common/view/editorColorRegistry';
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
import { editorActiveLinkForeground } from 'vs/platform/theme/common/colorRegistry';
import { IModelDeltaDecoration, IModelDecorationsChangeAccessor, ITextModel } from 'vs/editor/common/model';
import { INotificationService } from 'vs/platform/notification/common/notification';
class CodeLensViewZone implements editorBrowser.IViewZone {
@@ -72,7 +71,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
editor: editorBrowser.ICodeEditor,
symbolRange: Range,
commandService: ICommandService,
messageService: IMessageService
notificationService: INotificationService
) {
this._id = 'codeLensWidget' + (++CodeLensContentWidget._idPool);
@@ -95,7 +94,7 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
if (command) {
editor.focus();
commandService.executeCommand(command.id, ...command.arguments).done(undefined, err => {
messageService.show(Severity.Error, err);
notificationService.error(err);
});
}
}
@@ -181,7 +180,7 @@ export interface IDecorationIdCallback {
export class CodeLensHelper {
private _removeDecorations: string[];
private _addDecorations: editorCommon.IModelDeltaDecoration[];
private _addDecorations: IModelDeltaDecoration[];
private _addDecorationsCallbacks: IDecorationIdCallback[];
constructor() {
@@ -190,7 +189,7 @@ export class CodeLensHelper {
this._addDecorationsCallbacks = [];
}
addDecoration(decoration: editorCommon.IModelDeltaDecoration, callback: IDecorationIdCallback): void {
addDecoration(decoration: IModelDeltaDecoration, callback: IDecorationIdCallback): void {
this._addDecorations.push(decoration);
this._addDecorationsCallbacks.push(callback);
}
@@ -199,7 +198,7 @@ export class CodeLensHelper {
this._removeDecorations.push(decorationId);
}
commit(changeAccessor: editorCommon.IModelDecorationsChangeAccessor): void {
commit(changeAccessor: IModelDecorationsChangeAccessor): void {
var resultingDecorations = changeAccessor.deltaDecorations(this._removeDecorations, this._addDecorations);
for (let i = 0, len = resultingDecorations.length; i < len; i++) {
this._addDecorationsCallbacks[i](resultingDecorations[i]);
@@ -221,7 +220,7 @@ export class CodeLens {
editor: editorBrowser.ICodeEditor,
helper: CodeLensHelper,
viewZoneChangeAccessor: editorBrowser.IViewZoneChangeAccessor,
commandService: ICommandService, messageService: IMessageService,
commandService: ICommandService, notificationService: INotificationService,
updateCallabck: Function
) {
this._editor = editor;
@@ -244,7 +243,7 @@ export class CodeLens {
}
});
this._contentWidget = new CodeLensContentWidget(editor, range, commandService, messageService);
this._contentWidget = new CodeLensContentWidget(editor, range, commandService, notificationService);
this._viewZone = new CodeLensViewZone(range.startLineNumber - 1, updateCallabck);
this._viewZoneId = viewZoneChangeAccessor.addZone(this._viewZone);
@@ -285,7 +284,7 @@ export class CodeLens {
});
}
computeIfNecessary(model: editorCommon.IModel): ICodeLensData[] {
computeIfNecessary(model: ITextModel): ICodeLensData[] {
this._contentWidget.updateVisibility(); // trigger the fade in
if (!this._contentWidget.isVisible()) {
return null;