mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-17 17:22:42 -05:00
* 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
307 lines
9.3 KiB
TypeScript
307 lines
9.3 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* 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 { localize } from 'vs/nls';
|
|
import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
|
|
import URI from 'vs/base/common/uri';
|
|
import * as vscode from 'vscode';
|
|
import { MainContext, MainThreadDiagnosticsShape, ExtHostDiagnosticsShape, IMainContext } from './extHost.protocol';
|
|
import { DiagnosticSeverity } from './extHostTypes';
|
|
import * as converter from './extHostTypeConverters';
|
|
import { mergeSort } from 'vs/base/common/arrays';
|
|
import { Event, Emitter, debounceEvent, mapEvent } from 'vs/base/common/event';
|
|
import { keys } from 'vs/base/common/map';
|
|
|
|
export class DiagnosticCollection implements vscode.DiagnosticCollection {
|
|
|
|
private readonly _name: string;
|
|
private readonly _owner: string;
|
|
private readonly _maxDiagnosticsPerFile: number;
|
|
private readonly _onDidChangeDiagnostics: Emitter<(vscode.Uri | string)[]>;
|
|
private readonly _proxy: MainThreadDiagnosticsShape;
|
|
|
|
private _isDisposed = false;
|
|
private _data = new Map<string, vscode.Diagnostic[]>();
|
|
|
|
constructor(name: string, owner: string, maxDiagnosticsPerFile: number, proxy: MainThreadDiagnosticsShape, onDidChangeDiagnostics: Emitter<(vscode.Uri | string)[]>) {
|
|
this._name = name;
|
|
this._owner = owner;
|
|
this._maxDiagnosticsPerFile = maxDiagnosticsPerFile;
|
|
this._proxy = proxy;
|
|
this._onDidChangeDiagnostics = onDidChangeDiagnostics;
|
|
}
|
|
|
|
dispose(): void {
|
|
if (!this._isDisposed) {
|
|
this._onDidChangeDiagnostics.fire(keys(this._data));
|
|
this._proxy.$clear(this._owner);
|
|
this._data = undefined;
|
|
this._isDisposed = true;
|
|
}
|
|
}
|
|
|
|
get name(): string {
|
|
this._checkDisposed();
|
|
return this._name;
|
|
}
|
|
|
|
set(uri: vscode.Uri, diagnostics: vscode.Diagnostic[]): void;
|
|
set(entries: [vscode.Uri, vscode.Diagnostic[]][]): void;
|
|
set(first: vscode.Uri | [vscode.Uri, vscode.Diagnostic[]][], diagnostics?: vscode.Diagnostic[]) {
|
|
|
|
if (!first) {
|
|
// this set-call is a clear-call
|
|
this.clear();
|
|
return;
|
|
}
|
|
|
|
// the actual implementation for #set
|
|
|
|
this._checkDisposed();
|
|
let toSync: vscode.Uri[];
|
|
|
|
if (first instanceof URI) {
|
|
|
|
if (!diagnostics) {
|
|
// remove this entry
|
|
this.delete(first);
|
|
return;
|
|
}
|
|
|
|
// update single row
|
|
this._data.set(first.toString(), diagnostics);
|
|
toSync = [first];
|
|
|
|
} else if (Array.isArray(first)) {
|
|
// update many rows
|
|
toSync = [];
|
|
let lastUri: vscode.Uri;
|
|
|
|
// ensure stable-sort
|
|
mergeSort(first, DiagnosticCollection._compareIndexedTuplesByUri);
|
|
|
|
for (const tuple of first) {
|
|
const [uri, diagnostics] = tuple;
|
|
if (!lastUri || uri.toString() !== lastUri.toString()) {
|
|
if (lastUri && this._data.get(lastUri.toString()).length === 0) {
|
|
this._data.delete(lastUri.toString());
|
|
}
|
|
lastUri = uri;
|
|
toSync.push(uri);
|
|
this._data.set(uri.toString(), []);
|
|
}
|
|
|
|
if (!diagnostics) {
|
|
// [Uri, undefined] means clear this
|
|
this._data.get(uri.toString()).length = 0;
|
|
} else {
|
|
this._data.get(uri.toString()).push(...diagnostics);
|
|
}
|
|
}
|
|
}
|
|
|
|
// compute change and send to main side
|
|
const entries: [URI, IMarkerData[]][] = [];
|
|
for (let uri of toSync) {
|
|
let marker: IMarkerData[];
|
|
let diagnostics = this._data.get(uri.toString());
|
|
if (diagnostics) {
|
|
|
|
// no more than N diagnostics per file
|
|
if (diagnostics.length > this._maxDiagnosticsPerFile) {
|
|
marker = [];
|
|
const order = [DiagnosticSeverity.Error, DiagnosticSeverity.Warning, DiagnosticSeverity.Information, DiagnosticSeverity.Hint];
|
|
orderLoop: for (let i = 0; i < 4; i++) {
|
|
for (let diagnostic of diagnostics) {
|
|
if (diagnostic.severity === order[i]) {
|
|
const len = marker.push(converter.Diagnostic.from(diagnostic));
|
|
if (len === this._maxDiagnosticsPerFile) {
|
|
break orderLoop;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// add 'signal' marker for showing omitted errors/warnings
|
|
marker.push({
|
|
severity: MarkerSeverity.Info,
|
|
message: localize({ key: 'limitHit', comment: ['amount of errors/warning skipped due to limits'] }, "Not showing {0} further errors and warnings.", diagnostics.length - this._maxDiagnosticsPerFile),
|
|
startLineNumber: marker[marker.length - 1].startLineNumber,
|
|
startColumn: marker[marker.length - 1].startColumn,
|
|
endLineNumber: marker[marker.length - 1].endLineNumber,
|
|
endColumn: marker[marker.length - 1].endColumn
|
|
});
|
|
} else {
|
|
marker = diagnostics.map(converter.Diagnostic.from);
|
|
}
|
|
}
|
|
|
|
entries.push([uri, marker]);
|
|
}
|
|
|
|
this._onDidChangeDiagnostics.fire(toSync);
|
|
this._proxy.$changeMany(this._owner, entries);
|
|
}
|
|
|
|
delete(uri: vscode.Uri): void {
|
|
this._checkDisposed();
|
|
this._onDidChangeDiagnostics.fire([uri]);
|
|
this._data.delete(uri.toString());
|
|
this._proxy.$changeMany(this._owner, [[uri, undefined]]);
|
|
}
|
|
|
|
clear(): void {
|
|
this._checkDisposed();
|
|
this._onDidChangeDiagnostics.fire(keys(this._data));
|
|
this._data.clear();
|
|
this._proxy.$clear(this._owner);
|
|
}
|
|
|
|
forEach(callback: (uri: URI, diagnostics: vscode.Diagnostic[], collection: DiagnosticCollection) => any, thisArg?: any): void {
|
|
this._checkDisposed();
|
|
this._data.forEach((value, key) => {
|
|
let uri = URI.parse(key);
|
|
callback.apply(thisArg, [uri, this.get(uri), this]);
|
|
});
|
|
}
|
|
|
|
get(uri: URI): vscode.Diagnostic[] {
|
|
this._checkDisposed();
|
|
let result = this._data.get(uri.toString());
|
|
if (Array.isArray(result)) {
|
|
return <vscode.Diagnostic[]>Object.freeze(result.slice(0));
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
has(uri: URI): boolean {
|
|
this._checkDisposed();
|
|
return Array.isArray(this._data.get(uri.toString()));
|
|
}
|
|
|
|
private _checkDisposed() {
|
|
if (this._isDisposed) {
|
|
throw new Error('illegal state - object is disposed');
|
|
}
|
|
}
|
|
|
|
private static _compareIndexedTuplesByUri(a: [vscode.Uri, vscode.Diagnostic[]], b: [vscode.Uri, vscode.Diagnostic[]]): number {
|
|
if (a[0].toString() < b[0].toString()) {
|
|
return -1;
|
|
} else if (a[0].toString() > b[0].toString()) {
|
|
return 1;
|
|
} else {
|
|
return 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
|
|
|
|
private static _idPool: number = 0;
|
|
private static readonly _maxDiagnosticsPerFile: number = 1000;
|
|
|
|
private readonly _proxy: MainThreadDiagnosticsShape;
|
|
private readonly _collections = new Map<string, DiagnosticCollection>();
|
|
private readonly _onDidChangeDiagnostics = new Emitter<(vscode.Uri | string)[]>();
|
|
|
|
static _debouncer(last: (vscode.Uri | string)[], current: (vscode.Uri | string)[]): (vscode.Uri | string)[] {
|
|
if (!last) {
|
|
return current;
|
|
} else {
|
|
return last.concat(current);
|
|
}
|
|
}
|
|
|
|
static _mapper(last: (vscode.Uri | string)[]): { uris: vscode.Uri[] } {
|
|
let uris: vscode.Uri[] = [];
|
|
let map = new Set<string>();
|
|
for (const uri of last) {
|
|
if (typeof uri === 'string') {
|
|
if (!map.has(uri)) {
|
|
map.add(uri);
|
|
uris.push(URI.parse(uri));
|
|
}
|
|
} else {
|
|
if (!map.has(uri.toString())) {
|
|
map.add(uri.toString());
|
|
uris.push(uri);
|
|
}
|
|
}
|
|
}
|
|
Object.freeze(uris);
|
|
return { uris };
|
|
}
|
|
|
|
readonly onDidChangeDiagnostics: Event<vscode.DiagnosticChangeEvent> = mapEvent(debounceEvent(this._onDidChangeDiagnostics.event, ExtHostDiagnostics._debouncer, 50), ExtHostDiagnostics._mapper);
|
|
|
|
constructor(mainContext: IMainContext) {
|
|
this._proxy = mainContext.getProxy(MainContext.MainThreadDiagnostics);
|
|
}
|
|
|
|
createDiagnosticCollection(name: string): vscode.DiagnosticCollection {
|
|
let { _collections, _proxy, _onDidChangeDiagnostics } = this;
|
|
let owner: string;
|
|
if (!name) {
|
|
name = '_generated_diagnostic_collection_name_#' + ExtHostDiagnostics._idPool++;
|
|
owner = name;
|
|
} else if (!_collections.has(name)) {
|
|
owner = name;
|
|
} else {
|
|
console.warn(`DiagnosticCollection with name '${name}' does already exist.`);
|
|
do {
|
|
owner = name + ExtHostDiagnostics._idPool++;
|
|
} while (_collections.has(owner));
|
|
}
|
|
|
|
const result = new class extends DiagnosticCollection {
|
|
constructor() {
|
|
super(name, owner, ExtHostDiagnostics._maxDiagnosticsPerFile, _proxy, _onDidChangeDiagnostics);
|
|
_collections.set(owner, this);
|
|
}
|
|
dispose() {
|
|
super.dispose();
|
|
_collections.delete(owner);
|
|
}
|
|
};
|
|
|
|
return result;
|
|
}
|
|
|
|
getDiagnostics(resource: vscode.Uri): vscode.Diagnostic[];
|
|
getDiagnostics(): [vscode.Uri, vscode.Diagnostic[]][];
|
|
getDiagnostics(resource?: vscode.Uri): vscode.Diagnostic[] | [vscode.Uri, vscode.Diagnostic[]][] {
|
|
if (resource) {
|
|
return this._getDiagnostics(resource);
|
|
} else {
|
|
let index = new Map<string, number>();
|
|
let res: [vscode.Uri, vscode.Diagnostic[]][] = [];
|
|
this._collections.forEach(collection => {
|
|
collection.forEach((uri, diagnostics) => {
|
|
let idx = index.get(uri.toString());
|
|
if (typeof idx === 'undefined') {
|
|
idx = res.length;
|
|
index.set(uri.toString(), idx);
|
|
res.push([uri, []]);
|
|
}
|
|
res[idx][1] = res[idx][1].concat(...diagnostics);
|
|
});
|
|
});
|
|
return res;
|
|
}
|
|
}
|
|
|
|
private _getDiagnostics(resource: vscode.Uri): vscode.Diagnostic[] {
|
|
let res: vscode.Diagnostic[] = [];
|
|
this._collections.forEach(collection => {
|
|
if (collection.has(resource)) {
|
|
res = res.concat(collection.get(resource));
|
|
}
|
|
});
|
|
return res;
|
|
}
|
|
}
|