mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge VS Code 1.26.1 (#2394)
* Squash merge commits for 1.26 (#1) (#2323) * Polish tag search as per feedback (#55269) * Polish tag search as per feedback * Updated regex * Allow users to opt-out of features that send online requests in the background (#55097) * settings sweep #54690 * Minor css tweaks to enable eoverflow elipsis in more places (#55277) * fix an issue with titlebarheight when not scaling with zoom * Settings descriptions update #54690 * fixes #55209 * Settings editor - many padding fixes * More space above level 2 label * Fixing Cannot debug npm script using Yarn #55103 * Settings editor - show ellipsis when description overflows * Settings editor - ... fix measuring around links, relayout * Setting descriptions * Settings editor - fix ... for some short lines, fix select container width * Settings editor - overlay trees so scrollable shadow is full width * Fix #54133 - missing extension settings after reload * Settings color token description tweak * Settings editor - disable overflow indicator temporarily, needs to be faster * Added command to Run the selected npm script * fixes #54452 * fixes #54929 * fixes #55248 * prefix command with extension name * Contribute run selected to the context menu * node-debug@1.26.6 * Allow terminal rendererType to be swapped out at runtime Part of #53274 Fixes #55344 * Settings editor - fix not focusing search when restoring editor setInput must be actually async. Will be fixed naturally when we aren't using winJS promises... * Settings editor - TOC should only expand the section with a selected item * Bump node-debug2 * Settings editor - Tree focus outlines * Settings editor - don't blink the scrollbar when toc selection changes And hide TOC correctly when the editor is narrow * Settings editor - header rows should not be selectable * fixes #54877 * change debug assignee to isi * Settings sweep (#54690) * workaround for #55051 * Settings sweep (#54690) * settings sweep #54690 * Don't try closing tags when you type > after another > * Describe what implementation code lens does Fixes #55370 * fix javadoc formatter setting description * fixes #55325 * update to officical TS version * Settings editor - Even more padding, use semibold instead of bold * Fix #55357 - fix TOC twistie * fixes #55288 * explorer: refresh on di change file system provider registration fixes #53256 * Disable push to Linux repo to test standalone publisher * New env var to notify log level to extensions #54001 * Disable snippets in extension search (when not in suggest dropdown) (#55281) * Disable snippits in extension search (when not in suggest dropdown) * Add monaco input contributions * Fix bug preventing snippetSuggestions from taking effect in sub-editors * Latest emmet helper to fix #52366 * Fix comment updates for threads within same file * Allow extensions to log telemetry to log files #54001 * Pull latest css grammar * files.exclude control - use same style for "add" vs "edit" * files.exclude control - focus/keyboard behavior * don't show menubar too early * files.exclude - better styling * Place cursor at end of extensions search box on autofill (#55254) * Place cursor at end of extensions search box on autofill * Use position instead of selection * fix linux build issue (empty if block) * Settings editor - fix extension category prefixes * Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO * File/Text search provider docs * Fixes #52655 * Include epoch (#55008) * Fixes #53385 * Fixes #49480 * VS Code Insiders (Users) not opening Fixes #55353 * Better handling of the case when the extension host fails to start * Fixes #53966 * Remove confusing Start from wordPartLeft commands ID * vscode-xterm@3.6.0-beta12 Fixes #55488 * Initial size is set to infinity!! Fixes #55461 * Polish embeddedEditorBackground * configuration service misses event * Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query * Select all not working in issue reporter on mac, fixes #55424 * Disable fuzzy matching for extensions autosuggest (#55498) * Fix clipping of extensions search border in some third party themes (#55504) * fixes #55538 * Fix bug causing an aria alert to not be shown the third time (and odd numbers thereafter) * Settings editor - work around rendering glitch with webkit-line-clamp * Settings editor - revert earlier '...' changes * Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason * Settings editor - better overflow indicator * Don't show existing filters in autocomplete (#55495) * Dont show existing filters in autocomplete * Simplify * Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543) * fixes #55223 * Update vscode-css-languageservice to 3.0.10-next.1 * Fix #55509 - settings navigation * Fix #55519 * Fix #55520 * FIx #55524 * Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly * oss updates for endgame * Fix unit tests * fixes #55522 * Avoid missing manifest error from bubbling up #54757 * Settings format crawl * Search provider - Fix FileSearchProvider to return array, not progress * Fix #55598 * Settings editor - fix NPE rendering settings with no description * dont render inden guides in search box (#55600) * fixes #55454 * More settings crawl * Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex * Fix FileSearchProvider unit tests for progress change * fixes #55561 * Settings description update for #54690 * Update setting descriptions for online services * Minor edits * fixes #55513 * fixes #55451 * Fix #55612 - fix findTextInFiles cancellation * fixes #55539 * More setting description tweaks * Setting to disable online experiments #54354 * fixes #55507 * fixes #55515 * Show online services action only in Insiders for now * Settings editor - change toc behavior default to 'filter' * Settings editor - nicer filter count style during search * Fix #55617 - search viewlet icons * Settings editor - better styling for element count indicator * SearchProvider - fix NPE when searching extraFileResources * Allow extends to work without json suffix Fixes #16905 * Remove accessability options logic entirely Follow up on #55451 * use latest version of DAP * fixes #55490 * fixes #55122 * fixes #52332 * Avoid assumptions about git: URIs (fixes #36236) * relative path for descriptions * resourece: get rid of isFile context key fixes #48275 * Register previous ids for compatibility (#53497) * more tuning for #48275 * no need to always re-read "files explorer" fixes #52003 * read out active composites properly fixes #51967 * Update link colors for hc theme to meet color contrast ratio, fixes #55651 Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated * detect 'winpty-agent.exe'; fixes #55672 * node-debug@1.26.7 * reset counter on new label * Settings editor - fix multiple setting links in one description * Settings editor - color code blocks in setting descriptions, fix #55532 * Settings editor - hover color in TOC * Settings editor - fix navigation NPE * Settings editor - fix text control width * Settings editor - maybe fix #55684 * Fix bug causing cursor to not move on paste * fixes #53582 * Use ctrlCmd instead of ctrl for go down from search box * fixes #55264 * fixes #55456 * filter for spcaes before triggering search (#55611) * Fix #55698 - don't lose filtered TOC counts when refreshing TOC * fixes #55421 * fixes #28979 * fixes #55576 * only add check for updates to windows/linux help * readonly files: append decoration to label fixes #53022 * debug: do not show toolbar while initialising fixes #55026 * Opening launch.json should not activate debug extensions fixes #55029 * fixes #55435 * fixes #55434 * fixes #55439 * trigger menu only on altkey up * Fix #50555 - fix settings editor memory leak * Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render * fixes #55335 * proper fix for readonly model fixes #53022 * improve FoldingRangeKind spec (for #55686) * Use class with static fields (fixes #55494) * Fixes #53671 * fixes #54630 * [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324 * cleanup deps * debug issues back to andre * update electron for smoketest * Fix #55757 - prevent settings tabs from overflowing * Fix #53897 - revert setting menu defaults to old editor * Add enum descriptions to `typescript.preferences.importModuleSpecifier` * Fix #55767 - leaking style elements from settings editor * Fix #55521 - prevent flashing when clicking in exclude control * Update Git modified color for contrast ratio, fixes #53140 * Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. * Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode"" This reverts commit 53949d963f39e40757557c6526332354a31d9154. * don't ask to install an incomplete menu * Fix NPE in terminal AccessibilityManager Fixes #55744 * don't display fallback menu unless we've closed the last window * fixes #55547 * Fix smoke tests for extension search box * Update OSSREADME.json for Electron 2.0.5 * Update distro Includes Chromium license changes * fix #55455 * fix #55865 * fixes #55893 * Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805) * Fix bug causing workspace recommendations to go away upon ignoring a recommendation * ONly show on @recommended or @recommended:workspace * Make more consistant * Fix #55911 * Understand json activity (#55926) * Understand json file activity * Refactoring * adding composer.json * Distro update for experiments * use terminal.processId for auto-attach; fixes #55918 * Reject invalid URI with vscode.openFolder (for #55891) * improve win32 setup system vs user detection fixes #55840 fixes #55840 delay winreg import related to #55840 show notification earlier related to #55840 fix #55840 update inno setup message related to #55840 * Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead * Bring back the old menu due to electron 2.0 issues (#55913) * add the old menu back for native menus * make menu labels match * `vscode.openFolder`: treat missing URI schema gracefully (for #55891) * delay EH reattach; fixes #55955 * Mark all json files under appSettingsHome as settings * Use localized strings for telemetry opt-out * Exception when saving file editor opened from remote file provider (fixes #55051) * Remove terminal menu from stable Fixes 56003 * VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933 * improve fix for #55891 * fix #55916 * Improve #55891 * increase EH debugging restart delay; fixes #55955 * Revert "Don't include non-resource entries in history quick pick" This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060. * Diff editor: horizontal scrollbar height is smaller (fixes #56062) * improve openFolder uri fix (correctly treat backslashes) * fixes #56116 repair ipc for native menubar keybindings * Fix #56240 - Open the JSON settings editor instead of the UI editor * Fix #55536 * uriDisplay: if no formatter is registered fall back to getPathlabel fixes #56104 * VSCode hangs when opening python file. Fixes #56377 * VS Code Hangs When Opening Specific PowerShell File. Fixes #56430 * Fix #56433 - search extraFileResources even when no folders open * Workaround #55649 * Fix in master #56371 * Fix tests #56371 * Fix in master #56317 * increase version to 1.26.1 * Fixes #56387: Handle SIGPIPE in extension host * fixes #56185 * Fix merge issues (part 1) * Fix build breaks (part 1) * Build breaks (part 2) * Build breaks (part 3) * More build breaks (part 4) * Fix build breaks (part 5) * WIP * Fix menus * Render query result and message panels (#2363) * Put back query editor hot exit changes * Fix grid changes that broke profiler (#2365) * Update APIs for saving query editor state * Fix restore view state for profiler and edit data * Updating custom default themes to support 4.5:1 contrast ratio * Test updates * Fix Extension Manager and Windows Setup * Update license headers * Add appveyor and travis files back * Fix hidden modal dropdown issue
This commit is contained in:
Karl Burtram
@@ -9,11 +9,6 @@
|
||||
border-bottom-width: 1px;
|
||||
}
|
||||
|
||||
.monaco-editor .zone-widget .zone-widget-container.reference-zone-widget.results-loaded {
|
||||
-webkit-transition: height 100ms ease-in;
|
||||
transition: height 100ms ease-in;
|
||||
}
|
||||
|
||||
.monaco-editor .reference-zone-widget .inline {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
|
||||
@@ -122,7 +122,7 @@ export abstract class PeekViewWidget extends ZoneWidget {
|
||||
}
|
||||
|
||||
protected _fillHead(container: HTMLElement): void {
|
||||
var titleElement = $('.peekview-title').
|
||||
const titleElement = $('.peekview-title').
|
||||
on(dom.EventType.CLICK, e => this._onTitleClick(<MouseEvent>e)).
|
||||
appendTo(this._headElement).
|
||||
getHTMLElement();
|
||||
@@ -178,8 +178,8 @@ export abstract class PeekViewWidget extends ZoneWidget {
|
||||
return;
|
||||
}
|
||||
|
||||
var headHeight = Math.ceil(this.editor.getConfiguration().lineHeight * 1.2),
|
||||
bodyHeight = heightInPixel - (headHeight + 2 /* the border-top/bottom width*/);
|
||||
const headHeight = Math.ceil(this.editor.getConfiguration().lineHeight * 1.2);
|
||||
const bodyHeight = heightInPixel - (headHeight + 2 /* the border-top/bottom width*/);
|
||||
|
||||
this._doLayoutHead(headHeight, widthInPixel);
|
||||
this._doLayoutBody(bodyHeight, widthInPixel);
|
||||
|
||||
@@ -6,21 +6,18 @@
|
||||
|
||||
import * as nls from 'vs/nls';
|
||||
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
|
||||
import URI from 'vs/base/common/uri';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { IEditorService } from 'vs/platform/editor/common/editor';
|
||||
import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
|
||||
import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
|
||||
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
|
||||
import { Position, IPosition } from 'vs/editor/common/core/position';
|
||||
import { Range } from 'vs/editor/common/core/range';
|
||||
import * as editorCommon from 'vs/editor/common/editorCommon';
|
||||
import { registerEditorAction, ServicesAccessor, EditorAction, registerEditorContribution, registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions';
|
||||
import { Location, ReferenceProviderRegistry } from 'vs/editor/common/modes';
|
||||
import { Range } from 'vs/editor/common/core/range';
|
||||
import { PeekContext, getOuterEditor } from './peekViewWidget';
|
||||
import { ReferencesController, RequestOptions, ctxReferenceSearchVisible } from './referencesController';
|
||||
import { ReferencesModel, OneReference } from './referencesModel';
|
||||
import { asWinJsPromise } from 'vs/base/common/async';
|
||||
import { asWinJsPromise, createCancelablePromise } from 'vs/base/common/async';
|
||||
import { onUnexpectedExternalError } from 'vs/base/common/errors';
|
||||
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
|
||||
import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
|
||||
@@ -28,8 +25,12 @@ import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
|
||||
import { ITextModel } from 'vs/editor/common/model';
|
||||
import { IListService } from 'vs/platform/list/browser/listService';
|
||||
import { ctxReferenceWidgetSearchTreeFocused } from 'vs/editor/contrib/referenceSearch/referencesWidget';
|
||||
import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
|
||||
import URI from 'vs/base/common/uri';
|
||||
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
|
||||
import { CancellationToken } from 'vs/base/common/cancellation';
|
||||
|
||||
const defaultReferenceSearchOptions: RequestOptions = {
|
||||
export const defaultReferenceSearchOptions: RequestOptions = {
|
||||
getMetaTitle(model) {
|
||||
return model.references.length > 1 && nls.localize('meta.titleReference', " – {0} references", model.references.length);
|
||||
}
|
||||
@@ -69,7 +70,8 @@ export class ReferenceAction extends EditorAction {
|
||||
EditorContextKeys.isInEmbeddedEditor.toNegated()),
|
||||
kbOpts: {
|
||||
kbExpr: EditorContextKeys.editorTextFocus,
|
||||
primary: KeyMod.Shift | KeyCode.F12
|
||||
primary: KeyMod.Shift | KeyCode.F12,
|
||||
weight: KeybindingWeight.EditorContrib
|
||||
},
|
||||
menuOpts: {
|
||||
group: 'navigation',
|
||||
@@ -85,7 +87,7 @@ export class ReferenceAction extends EditorAction {
|
||||
}
|
||||
let range = editor.getSelection();
|
||||
let model = editor.getModel();
|
||||
let references = provideReferences(model, range.getStartPosition()).then(references => new ReferencesModel(references));
|
||||
let references = createCancelablePromise(token => provideReferences(model, range.getStartPosition(), token).then(references => new ReferencesModel(references)));
|
||||
controller.toggleWidget(range, references, defaultReferenceSearchOptions);
|
||||
}
|
||||
}
|
||||
@@ -95,7 +97,6 @@ registerEditorContribution(ReferenceController);
|
||||
registerEditorAction(ReferenceAction);
|
||||
|
||||
let findReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resource: URI, position: IPosition) => {
|
||||
|
||||
if (!(resource instanceof URI)) {
|
||||
throw new Error('illegal argument, uri');
|
||||
}
|
||||
@@ -103,9 +104,8 @@ let findReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour
|
||||
throw new Error('illegal argument, position');
|
||||
}
|
||||
|
||||
return accessor.get(IEditorService).openEditor({ resource }).then(editor => {
|
||||
|
||||
let control = editor.getControl();
|
||||
const codeEditorService = accessor.get(ICodeEditorService);
|
||||
return codeEditorService.openCodeEditor({ resource }, codeEditorService.getFocusedCodeEditor()).then(control => {
|
||||
if (!isCodeEditor(control)) {
|
||||
return undefined;
|
||||
}
|
||||
@@ -115,7 +115,7 @@ let findReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let references = provideReferences(control.getModel(), Position.lift(position)).then(references => new ReferencesModel(references));
|
||||
let references = createCancelablePromise(token => provideReferences(control.getModel(), Position.lift(position), token).then(references => new ReferencesModel(references)));
|
||||
let range = new Range(position.lineNumber, position.column, position.lineNumber, position.column);
|
||||
return TPromise.as(controller.toggleWidget(range, references, defaultReferenceSearchOptions));
|
||||
});
|
||||
@@ -126,9 +126,8 @@ let showReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour
|
||||
throw new Error('illegal argument, uri expected');
|
||||
}
|
||||
|
||||
return accessor.get(IEditorService).openEditor({ resource: resource }).then(editor => {
|
||||
|
||||
let control = editor.getControl();
|
||||
const codeEditorService = accessor.get(ICodeEditorService);
|
||||
return codeEditorService.openCodeEditor({ resource }, codeEditorService.getFocusedCodeEditor()).then(control => {
|
||||
if (!isCodeEditor(control)) {
|
||||
return undefined;
|
||||
}
|
||||
@@ -140,13 +139,11 @@ let showReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour
|
||||
|
||||
return TPromise.as(controller.toggleWidget(
|
||||
new Range(position.lineNumber, position.column, position.lineNumber, position.column),
|
||||
TPromise.as(new ReferencesModel(references)),
|
||||
createCancelablePromise(_ => Promise.resolve(new ReferencesModel(references))),
|
||||
defaultReferenceSearchOptions)).then(() => true);
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
|
||||
// register commands
|
||||
|
||||
CommandsRegistry.registerCommand({
|
||||
@@ -181,7 +178,7 @@ function openReferenceToSide(accessor: ServicesAccessor, args: any) {
|
||||
}
|
||||
|
||||
function withController(accessor: ServicesAccessor, fn: (controller: ReferencesController) => void): void {
|
||||
var outerEditor = getOuterEditor(accessor);
|
||||
const outerEditor = getOuterEditor(accessor);
|
||||
if (!outerEditor) {
|
||||
return;
|
||||
}
|
||||
@@ -196,7 +193,7 @@ function withController(accessor: ServicesAccessor, fn: (controller: ReferencesC
|
||||
|
||||
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: 'goToNextReference',
|
||||
weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
|
||||
weight: KeybindingWeight.WorkbenchContrib + 50,
|
||||
primary: KeyCode.F4,
|
||||
when: ctxReferenceSearchVisible,
|
||||
handler(accessor) {
|
||||
@@ -208,7 +205,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
|
||||
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: 'goToNextReferenceFromEmbeddedEditor',
|
||||
weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
|
||||
weight: KeybindingWeight.EditorContrib + 50,
|
||||
primary: KeyCode.F4,
|
||||
when: PeekContext.inPeekEditor,
|
||||
handler(accessor) {
|
||||
@@ -220,7 +217,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
|
||||
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: 'goToPreviousReference',
|
||||
weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
|
||||
weight: KeybindingWeight.WorkbenchContrib + 50,
|
||||
primary: KeyMod.Shift | KeyCode.F4,
|
||||
when: ctxReferenceSearchVisible,
|
||||
handler(accessor) {
|
||||
@@ -232,7 +229,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
|
||||
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: 'goToPreviousReferenceFromEmbeddedEditor',
|
||||
weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
|
||||
weight: KeybindingWeight.EditorContrib + 50,
|
||||
primary: KeyMod.Shift | KeyCode.F4,
|
||||
when: PeekContext.inPeekEditor,
|
||||
handler(accessor) {
|
||||
@@ -244,7 +241,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
|
||||
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: 'closeReferenceSearch',
|
||||
weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
|
||||
weight: KeybindingWeight.WorkbenchContrib + 50,
|
||||
primary: KeyCode.Escape,
|
||||
secondary: [KeyMod.Shift | KeyCode.Escape],
|
||||
when: ContextKeyExpr.and(ctxReferenceSearchVisible, ContextKeyExpr.not('config.editor.stablePeek')),
|
||||
@@ -253,7 +250,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
|
||||
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: 'closeReferenceSearchEditor',
|
||||
weight: KeybindingsRegistry.WEIGHT.editorContrib(-101),
|
||||
weight: KeybindingWeight.EditorContrib - 101,
|
||||
primary: KeyCode.Escape,
|
||||
secondary: [KeyMod.Shift | KeyCode.Escape],
|
||||
when: ContextKeyExpr.and(PeekContext.inPeekEditor, ContextKeyExpr.not('config.editor.stablePeek')),
|
||||
@@ -262,7 +259,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
|
||||
KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
id: 'openReferenceToSide',
|
||||
weight: KeybindingsRegistry.WEIGHT.editorContrib(),
|
||||
weight: KeybindingWeight.EditorContrib,
|
||||
primary: KeyMod.CtrlCmd | KeyCode.Enter,
|
||||
mac: {
|
||||
primary: KeyMod.WinCtrl | KeyCode.Enter
|
||||
@@ -271,7 +268,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
||||
handler: openReferenceToSide
|
||||
});
|
||||
|
||||
export function provideReferences(model: ITextModel, position: Position): TPromise<Location[]> {
|
||||
export function provideReferences(model: ITextModel, position: Position, token: CancellationToken): Promise<Location[]> {
|
||||
|
||||
// collect references from all providers
|
||||
const promises = ReferenceProviderRegistry.ordered(model).map(provider => {
|
||||
@@ -287,7 +284,7 @@ export function provideReferences(model: ITextModel, position: Position): TPromi
|
||||
});
|
||||
});
|
||||
|
||||
return TPromise.join(promises).then(references => {
|
||||
return Promise.all(promises).then(references => {
|
||||
let result: Location[] = [];
|
||||
for (let ref of references) {
|
||||
if (ref) {
|
||||
@@ -298,4 +295,4 @@ export function provideReferences(model: ITextModel, position: Position): TPromi
|
||||
});
|
||||
}
|
||||
|
||||
registerDefaultLanguageCommand('_executeReferenceProvider', provideReferences);
|
||||
registerDefaultLanguageCommand('_executeReferenceProvider', (model, position) => provideReferences(model, position, CancellationToken.None));
|
||||
|
||||
@@ -8,23 +8,20 @@ import * as nls from 'vs/nls';
|
||||
import { onUnexpectedError } from 'vs/base/common/errors';
|
||||
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { IEditorService } from 'vs/platform/editor/common/editor';
|
||||
import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
||||
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
|
||||
import { IStorageService } from 'vs/platform/storage/common/storage';
|
||||
import * as editorCommon from 'vs/editor/common/editorCommon';
|
||||
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
|
||||
import { ReferencesModel } from './referencesModel';
|
||||
import { ReferenceWidget, LayoutData } from './referencesWidget';
|
||||
import { Range } from 'vs/editor/common/core/range';
|
||||
import { ITextModelService } from 'vs/editor/common/services/resolverService';
|
||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
import { Position } from 'vs/editor/common/core/position';
|
||||
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
|
||||
import { Location } from 'vs/editor/common/modes';
|
||||
import { INotificationService } from 'vs/platform/notification/common/notification';
|
||||
import { CancelablePromise } from 'vs/base/common/async';
|
||||
|
||||
export const ctxReferenceSearchVisible = new RawContextKey<boolean>('referenceSearchVisible', false);
|
||||
|
||||
@@ -54,15 +51,11 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
|
||||
private _defaultTreeKeyboardSupport: boolean,
|
||||
editor: ICodeEditor,
|
||||
@IContextKeyService contextKeyService: IContextKeyService,
|
||||
@IEditorService private readonly _editorService: IEditorService,
|
||||
@ITextModelService private readonly _textModelResolverService: ITextModelService,
|
||||
@ICodeEditorService private readonly _editorService: ICodeEditorService,
|
||||
@INotificationService private readonly _notificationService: INotificationService,
|
||||
@IInstantiationService private readonly _instantiationService: IInstantiationService,
|
||||
@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
|
||||
@IStorageService private readonly _storageService: IStorageService,
|
||||
@IThemeService private readonly _themeService: IThemeService,
|
||||
@IConfigurationService private readonly _configurationService: IConfigurationService,
|
||||
@optional(IEnvironmentService) private _environmentService: IEnvironmentService
|
||||
) {
|
||||
this._editor = editor;
|
||||
this._referenceSearchVisible = ctxReferenceSearchVisible.bindTo(contextKeyService);
|
||||
@@ -73,14 +66,16 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
|
||||
}
|
||||
|
||||
public dispose(): void {
|
||||
if (this._widget) {
|
||||
this._widget.dispose();
|
||||
this._widget = null;
|
||||
}
|
||||
this._referenceSearchVisible.reset();
|
||||
dispose(this._disposables);
|
||||
dispose(this._widget);
|
||||
dispose(this._model);
|
||||
this._widget = null;
|
||||
this._model = null;
|
||||
this._editor = null;
|
||||
}
|
||||
|
||||
public toggleWidget(range: Range, modelPromise: TPromise<ReferencesModel>, options: RequestOptions): void {
|
||||
public toggleWidget(range: Range, modelPromise: CancelablePromise<ReferencesModel>, options: RequestOptions): void {
|
||||
|
||||
// close current widget and return early is position didn't change
|
||||
let widgetPosition: Position;
|
||||
@@ -103,7 +98,7 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
|
||||
}));
|
||||
const storageKey = 'peekViewLayout';
|
||||
const data = <LayoutData>JSON.parse(this._storageService.get(storageKey, undefined, '{}'));
|
||||
this._widget = new ReferenceWidget(this._editor, this._defaultTreeKeyboardSupport, data, this._textModelResolverService, this._contextService, this._themeService, this._instantiationService, this._environmentService);
|
||||
this._widget = this._instantiationService.createInstance(ReferenceWidget, this._editor, this._defaultTreeKeyboardSupport, data);
|
||||
this._widget.setTitle(nls.localize('labelLoading', "Loading..."));
|
||||
this._widget.show(range);
|
||||
this._disposables.push(this._widget.onDidClose(() => {
|
||||
@@ -179,7 +174,7 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
|
||||
if (this._model) { // can be called while still resolving...
|
||||
let source = this._model.nearestReference(this._editor.getModel().uri, this._widget.position);
|
||||
let target = this._model.nextOrPreviousReference(source, fwd);
|
||||
let editorFocus = this._editor.isFocused();
|
||||
let editorFocus = this._editor.hasTextFocus();
|
||||
await this._widget.setSelection(target);
|
||||
await this._gotoReference(target);
|
||||
if (editorFocus) {
|
||||
@@ -189,16 +184,12 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
|
||||
}
|
||||
|
||||
public closeWidget(): void {
|
||||
if (this._widget) {
|
||||
this._widget.dispose();
|
||||
this._widget = null;
|
||||
}
|
||||
dispose(this._widget);
|
||||
this._widget = null;
|
||||
this._referenceSearchVisible.reset();
|
||||
this._disposables = dispose(this._disposables);
|
||||
if (this._model) {
|
||||
this._model.dispose();
|
||||
this._model = null;
|
||||
}
|
||||
dispose(this._model);
|
||||
this._model = null;
|
||||
this._editor.focus();
|
||||
this._requestIdPool += 1; // Cancel pending requests
|
||||
}
|
||||
@@ -209,13 +200,13 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
|
||||
this._ignoreModelChangeEvent = true;
|
||||
const range = Range.lift(ref.range).collapseToStart();
|
||||
|
||||
return this._editorService.openEditor({
|
||||
return this._editorService.openCodeEditor({
|
||||
resource: ref.uri,
|
||||
options: { selection: range }
|
||||
}).then(openedEditor => {
|
||||
}, this._editor).then(openedEditor => {
|
||||
this._ignoreModelChangeEvent = false;
|
||||
|
||||
if (!openedEditor || openedEditor.getControl() !== this._editor) {
|
||||
if (!openedEditor || openedEditor !== this._editor) {
|
||||
// TODO@Alex TODO@Joh
|
||||
// when opening the current reference we might end up
|
||||
// in a different editor instance. that means we also have
|
||||
@@ -238,10 +229,10 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
|
||||
|
||||
public openReference(ref: Location, sideBySide: boolean): void {
|
||||
const { uri, range } = ref;
|
||||
this._editorService.openEditor({
|
||||
this._editorService.openCodeEditor({
|
||||
resource: uri,
|
||||
options: { selection: range }
|
||||
}, sideBySide);
|
||||
}, this._editor, sideBySide);
|
||||
|
||||
// clear stage
|
||||
if (!sideBySide) {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
import { localize } from 'vs/nls';
|
||||
import { Event, Emitter } from 'vs/base/common/event';
|
||||
import { basename, dirname } from 'vs/base/common/paths';
|
||||
import { basename } from 'vs/base/common/paths';
|
||||
import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
|
||||
import * as strings from 'vs/base/common/strings';
|
||||
import URI from 'vs/base/common/uri';
|
||||
@@ -46,14 +46,6 @@ export class OneReference {
|
||||
return this._parent.uri;
|
||||
}
|
||||
|
||||
public get name(): string {
|
||||
return this._parent.name;
|
||||
}
|
||||
|
||||
public get directory(): string {
|
||||
return this._parent.directory;
|
||||
}
|
||||
|
||||
public get range(): IRange {
|
||||
return this._range;
|
||||
}
|
||||
@@ -135,14 +127,6 @@ export class FileReferences implements IDisposable {
|
||||
return this._uri;
|
||||
}
|
||||
|
||||
public get name(): string {
|
||||
return basename(this.uri.fsPath);
|
||||
}
|
||||
|
||||
public get directory(): string {
|
||||
return dirname(this.uri.fsPath);
|
||||
}
|
||||
|
||||
public get preview(): FilePreview {
|
||||
return this._preview;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
import 'vs/css!./media/referencesWidget';
|
||||
import * as nls from 'vs/nls';
|
||||
import { onUnexpectedError } from 'vs/base/common/errors';
|
||||
import { getPathLabel } from 'vs/base/common/labels';
|
||||
import { Event, Emitter } from 'vs/base/common/event';
|
||||
import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
|
||||
import { Schemas } from 'vs/base/common/network';
|
||||
@@ -44,6 +43,9 @@ import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser
|
||||
import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { Location } from 'vs/editor/common/modes';
|
||||
import { ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
|
||||
import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
|
||||
import { dirname, basenameOrAuthority } from 'vs/base/common/resources';
|
||||
|
||||
|
||||
class DecorationsManager implements IDisposable {
|
||||
|
||||
@@ -203,7 +205,7 @@ class DataSource implements tree.IDataSource {
|
||||
}
|
||||
|
||||
public getParent(tree: tree.ITree, element: any): TPromise<any> {
|
||||
var result: any = null;
|
||||
let result: any = null;
|
||||
if (element instanceof FileReferences) {
|
||||
result = (<FileReferences>element).parent;
|
||||
} else if (element instanceof OneReference) {
|
||||
@@ -231,14 +233,14 @@ class Controller extends WorkbenchTreeController {
|
||||
return this._expandCollapse(tree, element);
|
||||
}
|
||||
|
||||
var result = super.onTap(tree, element, event);
|
||||
let result = super.onTap(tree, element, event);
|
||||
|
||||
this._onDidFocus.fire(element);
|
||||
return result;
|
||||
}
|
||||
|
||||
public onMouseDown(tree: tree.ITree, element: any, event: IMouseEvent): boolean {
|
||||
var isDoubleClick = event.detail === 2;
|
||||
let isDoubleClick = event.detail === 2;
|
||||
if (event.leftButton) {
|
||||
if (element instanceof FileReferences) {
|
||||
if (this.openOnSingleClick || isDoubleClick || this.isClickOnTwistie(event)) {
|
||||
@@ -248,8 +250,8 @@ class Controller extends WorkbenchTreeController {
|
||||
}
|
||||
}
|
||||
|
||||
var result = super.onClick(tree, element, event);
|
||||
var openToSide = event.ctrlKey || event.metaKey || event.altKey;
|
||||
let result = super.onClick(tree, element, event);
|
||||
let openToSide = event.ctrlKey || event.metaKey || event.altKey;
|
||||
if (openToSide && (isDoubleClick || this.openOnSingleClick)) {
|
||||
this._onDidOpenToSide.fire(element);
|
||||
} else if (isDoubleClick) {
|
||||
@@ -530,11 +532,10 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
editor: ICodeEditor,
|
||||
private _defaultTreeKeyboardSupport: boolean,
|
||||
public layoutData: LayoutData,
|
||||
private _textModelResolverService: ITextModelService,
|
||||
private _contextService: IWorkspaceContextService,
|
||||
themeService: IThemeService,
|
||||
private _instantiationService: IInstantiationService,
|
||||
private _environmentService: IEnvironmentService
|
||||
@IThemeService themeService: IThemeService,
|
||||
@ITextModelService private _textModelResolverService: ITextModelService,
|
||||
@IInstantiationService private _instantiationService: IInstantiationService,
|
||||
@IUriDisplayService private _uriDisplay: IUriDisplayService
|
||||
) {
|
||||
super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true });
|
||||
|
||||
@@ -585,7 +586,7 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
}
|
||||
|
||||
protected _fillBody(containerElement: HTMLElement): void {
|
||||
var container = $(containerElement);
|
||||
let container = $(containerElement);
|
||||
|
||||
this.setCssClass('reference-zone-widget');
|
||||
|
||||
@@ -597,7 +598,7 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
// editor
|
||||
container.div({ 'class': 'preview inline' }, (div: Builder) => {
|
||||
|
||||
var options: IEditorOptions = {
|
||||
let options: IEditorOptions = {
|
||||
scrollBeyondLastLine: false,
|
||||
scrollbar: {
|
||||
verticalScrollbarSize: 14,
|
||||
@@ -631,17 +632,17 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
|
||||
// tree
|
||||
container.div({ 'class': 'ref-tree inline' }, (div: Builder) => {
|
||||
var controller = this._instantiationService.createInstance(Controller, { keyboardSupport: this._defaultTreeKeyboardSupport, clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
|
||||
let controller = this._instantiationService.createInstance(Controller, { keyboardSupport: this._defaultTreeKeyboardSupport, clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
|
||||
this._callOnDispose.push(controller);
|
||||
|
||||
var config = <tree.ITreeConfiguration>{
|
||||
let config = <tree.ITreeConfiguration>{
|
||||
dataSource: this._instantiationService.createInstance(DataSource),
|
||||
renderer: this._instantiationService.createInstance(Renderer),
|
||||
controller,
|
||||
accessibilityProvider: new AriaProvider()
|
||||
};
|
||||
|
||||
var options: tree.ITreeOptions = {
|
||||
let options: tree.ITreeOptions = {
|
||||
twistiePixels: 20,
|
||||
ariaLabel: nls.localize('treeAriaLabel', "References")
|
||||
};
|
||||
@@ -651,7 +652,7 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
ctxReferenceWidgetSearchTreeFocused.bindTo(this._tree.contextKeyService);
|
||||
|
||||
// listen on selection and focus
|
||||
var onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
|
||||
let onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
|
||||
if (element instanceof OneReference) {
|
||||
if (kind === 'show') {
|
||||
this._revealReference(element, false);
|
||||
@@ -705,7 +706,7 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
this._preview.layout();
|
||||
}
|
||||
|
||||
public setSelection(selection: OneReference): TPromise<any> {
|
||||
public setSelection(selection: OneReference): Promise<any> {
|
||||
return this._revealReference(selection, true).then(() => {
|
||||
|
||||
// show in tree
|
||||
@@ -776,11 +777,11 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
private async _revealReference(reference: OneReference, revealParent: boolean): TPromise<void> {
|
||||
private async _revealReference(reference: OneReference, revealParent: boolean): Promise<void> {
|
||||
|
||||
// Update widget header
|
||||
if (reference.uri.scheme !== Schemas.inMemory) {
|
||||
this.setTitle(reference.name, getPathLabel(reference.directory, this._contextService, this._environmentService));
|
||||
this.setTitle(basenameOrAuthority(reference.uri), this._uriDisplay.getLabel(dirname(reference.uri), false));
|
||||
} else {
|
||||
this.setTitle(nls.localize('peekView.alternateTitle', "References"));
|
||||
}
|
||||
@@ -808,7 +809,7 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
this._previewModelReference = ref;
|
||||
let isSameModel = (this._preview.getModel() === model.textEditorModel);
|
||||
this._preview.setModel(model.textEditorModel);
|
||||
var sel = Range.lift(reference.range).collapseToStart();
|
||||
let sel = Range.lift(reference.range).collapseToStart();
|
||||
this._preview.setSelection(sel);
|
||||
this._preview.revealRangeInCenter(sel, isSameModel ? editorCommon.ScrollType.Smooth : editorCommon.ScrollType.Immediate);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user