Vscode merge (#4582)

* 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

View File

@@ -0,0 +1,610 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import 'vs/css!vs/editor/contrib/documentSymbols/media/symbol-icons';
import * as nls from 'vs/nls';
import * as types from 'vs/base/common/types';
import * as strings from 'vs/base/common/strings';
import { IEntryRunContext, Mode, IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen';
import { QuickOpenModel, IHighlight } from 'vs/base/parts/quickopen/browser/quickOpenModel';
import { QuickOpenHandler, EditorQuickOpenEntryGroup, QuickOpenAction } from 'vs/workbench/browser/quickopen';
import * as filters from 'vs/base/common/filters';
import { IEditor, IDiffEditorModel, IEditorViewState, ScrollType } from 'vs/editor/common/editorCommon';
import { IModelDecorationsChangeAccessor, OverviewRulerLane, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen';
import { DocumentSymbolProviderRegistry, DocumentSymbol, symbolKindToCssClass, SymbolKind } from 'vs/editor/common/modes';
import { IRange } from 'vs/editor/common/core/range';
import { themeColorFromId } from 'vs/platform/theme/common/themeService';
import { overviewRulerRangeHighlight } from 'vs/editor/common/view/editorColorRegistry';
import { GroupIdentifier, IEditorInput } from 'vs/workbench/common/editor';
import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
import { asPromise } from 'vs/base/common/async';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
export const GOTO_SYMBOL_PREFIX = '@';
export const SCOPE_PREFIX = ':';
const FALLBACK_NLS_SYMBOL_KIND = nls.localize('property', "properties ({0})");
const NLS_SYMBOL_KIND_CACHE: { [type: number]: string } = {
[SymbolKind.Method]: nls.localize('method', "methods ({0})"),
[SymbolKind.Function]: nls.localize('function', "functions ({0})"),
[SymbolKind.Constructor]: nls.localize('_constructor', "constructors ({0})"),
[SymbolKind.Variable]: nls.localize('variable', "variables ({0})"),
[SymbolKind.Class]: nls.localize('class', "classes ({0})"),
[SymbolKind.Struct]: nls.localize('struct', "structs ({0})"),
[SymbolKind.Event]: nls.localize('event', "events ({0})"),
[SymbolKind.Operator]: nls.localize('operator', "operators ({0})"),
[SymbolKind.Interface]: nls.localize('interface', "interfaces ({0})"),
[SymbolKind.Namespace]: nls.localize('namespace', "namespaces ({0})"),
[SymbolKind.Package]: nls.localize('package', "packages ({0})"),
[SymbolKind.TypeParameter]: nls.localize('typeParameter', "type parameters ({0})"),
[SymbolKind.Module]: nls.localize('modules', "modules ({0})"),
[SymbolKind.Property]: nls.localize('property', "properties ({0})"),
[SymbolKind.Enum]: nls.localize('enum', "enumerations ({0})"),
[SymbolKind.EnumMember]: nls.localize('enumMember', "enumeration members ({0})"),
[SymbolKind.String]: nls.localize('string', "strings ({0})"),
[SymbolKind.File]: nls.localize('file', "files ({0})"),
[SymbolKind.Array]: nls.localize('array', "arrays ({0})"),
[SymbolKind.Number]: nls.localize('number', "numbers ({0})"),
[SymbolKind.Boolean]: nls.localize('boolean', "booleans ({0})"),
[SymbolKind.Object]: nls.localize('object', "objects ({0})"),
[SymbolKind.Key]: nls.localize('key', "keys ({0})"),
[SymbolKind.Field]: nls.localize('field', "fields ({0})"),
[SymbolKind.Constant]: nls.localize('constant', "constants ({0})")
};
export class GotoSymbolAction extends QuickOpenAction {
static readonly ID = 'workbench.action.gotoSymbol';
static readonly LABEL = nls.localize('gotoSymbol', "Go to Symbol in File...");
constructor(actionId: string, actionLabel: string, @IQuickOpenService quickOpenService: IQuickOpenService) {
super(actionId, actionLabel, GOTO_SYMBOL_PREFIX, quickOpenService);
}
}
class OutlineModel extends QuickOpenModel {
applyFilter(searchValue: string): void {
// Normalize search
let normalizedSearchValue = searchValue;
if (searchValue.indexOf(SCOPE_PREFIX) === 0) {
normalizedSearchValue = normalizedSearchValue.substr(SCOPE_PREFIX.length);
}
// Check for match and update visibility and group label
this.entries.forEach((entry: SymbolEntry) => {
// Clear all state first
entry.setGroupLabel(undefined);
entry.setShowBorder(false);
entry.setHighlights([]);
entry.setHidden(false);
// Filter by search
if (normalizedSearchValue) {
const highlights = filters.matchesFuzzy2(normalizedSearchValue, entry.getLabel());
if (highlights) {
entry.setHighlights(highlights);
entry.setHidden(false);
} else if (!entry.isHidden()) {
entry.setHidden(true);
}
}
});
// Sort properly if actually searching
if (searchValue) {
if (searchValue.indexOf(SCOPE_PREFIX) === 0) {
this.entries.sort(this.sortScoped.bind(this, searchValue.toLowerCase()));
} else {
this.entries.sort(this.sortNormal.bind(this, searchValue.toLowerCase()));
}
}
// Otherwise restore order as appearing in outline
else {
this.entries.sort((a: SymbolEntry, b: SymbolEntry) => a.getIndex() - b.getIndex());
}
// Mark all type groups
const visibleResults = <SymbolEntry[]>this.getEntries(true);
if (visibleResults.length > 0 && searchValue.indexOf(SCOPE_PREFIX) === 0) {
let currentType: SymbolKind | null = null;
let currentResult: SymbolEntry | null = null;
let typeCounter = 0;
for (let i = 0; i < visibleResults.length; i++) {
const result = visibleResults[i];
// Found new type
if (currentType !== result.getKind()) {
// Update previous result with count
if (currentResult) {
currentResult.setGroupLabel(typeof currentType === 'number' ? this.renderGroupLabel(currentType, typeCounter) : undefined);
}
currentType = result.getKind();
currentResult = result;
typeCounter = 1;
result.setShowBorder(i > 0);
}
// Existing type, keep counting
else {
typeCounter++;
}
}
// Update previous result with count
if (currentResult) {
currentResult.setGroupLabel(typeof currentType === 'number' ? this.renderGroupLabel(currentType, typeCounter) : undefined);
}
}
// Mark first entry as outline
else if (visibleResults.length > 0) {
visibleResults[0].setGroupLabel(nls.localize('symbols', "symbols ({0})", visibleResults.length));
}
}
private sortNormal(searchValue: string, elementA: SymbolEntry, elementB: SymbolEntry): number {
// Handle hidden elements
if (elementA.isHidden() && elementB.isHidden()) {
return 0;
} else if (elementA.isHidden()) {
return 1;
} else if (elementB.isHidden()) {
return -1;
}
const elementAName = elementA.getLabel().toLowerCase();
const elementBName = elementB.getLabel().toLowerCase();
// Compare by name
const r = elementAName.localeCompare(elementBName);
if (r !== 0) {
return r;
}
// If name identical sort by range instead
const elementARange = elementA.getRange();
const elementBRange = elementB.getRange();
return elementARange.startLineNumber - elementBRange.startLineNumber;
}
private sortScoped(searchValue: string, elementA: SymbolEntry, elementB: SymbolEntry): number {
// Handle hidden elements
if (elementA.isHidden() && elementB.isHidden()) {
return 0;
} else if (elementA.isHidden()) {
return 1;
} else if (elementB.isHidden()) {
return -1;
}
// Remove scope char
searchValue = searchValue.substr(SCOPE_PREFIX.length);
// Sort by type first if scoped search
const elementATypeLabel = NLS_SYMBOL_KIND_CACHE[elementA.getKind()] || FALLBACK_NLS_SYMBOL_KIND;
const elementBTypeLabel = NLS_SYMBOL_KIND_CACHE[elementB.getKind()] || FALLBACK_NLS_SYMBOL_KIND;
let r = elementATypeLabel.localeCompare(elementBTypeLabel);
if (r !== 0) {
return r;
}
// Special sort when searching in scoped mode
if (searchValue) {
const elementAName = elementA.getLabel().toLowerCase();
const elementBName = elementB.getLabel().toLowerCase();
// Compare by name
r = elementAName.localeCompare(elementBName);
if (r !== 0) {
return r;
}
}
// Default to sort by range
const elementARange = elementA.getRange();
const elementBRange = elementB.getRange();
return elementARange.startLineNumber - elementBRange.startLineNumber;
}
private renderGroupLabel(type: SymbolKind, count: number): string {
let pattern = NLS_SYMBOL_KIND_CACHE[type];
if (!pattern) {
pattern = FALLBACK_NLS_SYMBOL_KIND;
}
return strings.format(pattern, count);
}
}
class SymbolEntry extends EditorQuickOpenEntryGroup {
private editorService: IEditorService;
private index: number;
private name: string;
private kind: SymbolKind;
private icon: string;
private description: string;
private range: IRange;
private revealRange: IRange;
private handler: GotoSymbolHandler;
constructor(index: number, name: string, kind: SymbolKind, description: string, icon: string, range: IRange, revealRange: IRange, highlights: IHighlight[], editorService: IEditorService, handler: GotoSymbolHandler) {
super();
this.index = index;
this.name = name;
this.kind = kind;
this.icon = icon;
this.description = description;
this.range = range;
this.revealRange = revealRange || range;
this.setHighlights(highlights);
this.editorService = editorService;
this.handler = handler;
}
getIndex(): number {
return this.index;
}
getLabel(): string {
return this.name;
}
getAriaLabel(): string {
return nls.localize('entryAriaLabel', "{0}, symbols", this.getLabel());
}
getIcon(): string {
return this.icon;
}
getDescription(): string {
return this.description;
}
getKind(): SymbolKind {
return this.kind;
}
getRange(): IRange {
return this.range;
}
getInput(): IEditorInput | null {
return this.editorService.activeEditor || null;
}
getOptions(pinned?: boolean): ITextEditorOptions {
return {
selection: this.toSelection(),
pinned
};
}
run(mode: Mode, context: IEntryRunContext): boolean {
if (mode === Mode.OPEN) {
return this.runOpen(context);
}
return this.runPreview();
}
private runOpen(context: IEntryRunContext): boolean {
// Check for sideBySide use
const sideBySide = context.keymods.ctrlCmd;
if (sideBySide) {
this.editorService.openEditor(this.getInput()!, this.getOptions(context.keymods.alt), SIDE_GROUP);
}
// Apply selection and focus
else {
const range = this.toSelection();
const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
if (activeTextEditorWidget) {
activeTextEditorWidget.setSelection(range);
activeTextEditorWidget.revealRangeInCenter(range, ScrollType.Smooth);
}
}
return true;
}
private runPreview(): boolean {
// Select Outline Position
const range = this.toSelection();
const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
if (activeTextEditorWidget) {
activeTextEditorWidget.revealRangeInCenter(range, ScrollType.Smooth);
// Decorate if possible
if (this.editorService.activeControl && types.isFunction(activeTextEditorWidget.changeDecorations)) {
this.handler.decorateOutline(this.range, range, activeTextEditorWidget, this.editorService.activeControl.group);
}
}
return false;
}
private toSelection(): IRange {
return {
startLineNumber: this.revealRange.startLineNumber,
startColumn: this.revealRange.startColumn || 1,
endLineNumber: this.revealRange.startLineNumber,
endColumn: this.revealRange.startColumn || 1
};
}
}
interface IEditorLineDecoration {
groupId: GroupIdentifier;
rangeHighlightId: string;
lineDecorationId: string;
}
export class GotoSymbolHandler extends QuickOpenHandler {
static readonly ID = 'workbench.picker.filesymbols';
private rangeHighlightDecorationId?: IEditorLineDecoration;
private lastKnownEditorViewState: IEditorViewState | null;
private cachedOutlineRequest?: Promise<OutlineModel | null>;
private pendingOutlineRequest?: CancellationTokenSource;
constructor(
@IEditorService private readonly editorService: IEditorService
) {
super();
this.registerListeners();
}
private registerListeners(): void {
this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange());
}
private onDidActiveEditorChange(): void {
this.clearOutlineRequest();
this.lastKnownEditorViewState = null;
this.rangeHighlightDecorationId = undefined;
}
getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel | null> {
searchValue = searchValue.trim();
// Support to cancel pending outline requests
if (!this.pendingOutlineRequest) {
this.pendingOutlineRequest = new CancellationTokenSource();
}
// Remember view state to be able to restore on cancel
if (!this.lastKnownEditorViewState) {
const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
if (activeTextEditorWidget) {
this.lastKnownEditorViewState = activeTextEditorWidget.saveViewState();
}
}
// Resolve Outline Model
return this.getOutline().then(outline => {
if (!outline) {
return outline;
}
if (token.isCancellationRequested) {
return outline;
}
// Filter by search
outline.applyFilter(searchValue);
return outline;
});
}
getEmptyLabel(searchString: string): string {
if (searchString.length > 0) {
return nls.localize('noSymbolsMatching', "No symbols matching");
}
return nls.localize('noSymbolsFound', "No symbols found");
}
getAriaLabel(): string {
return nls.localize('gotoSymbolHandlerAriaLabel', "Type to narrow down symbols of the currently active editor.");
}
canRun(): boolean | string {
let canRun = false;
const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
if (activeTextEditorWidget) {
let model = activeTextEditorWidget.getModel();
if (model && (<IDiffEditorModel>model).modified && (<IDiffEditorModel>model).original) {
model = (<IDiffEditorModel>model).modified; // Support for diff editor models
}
if (model && types.isFunction((<ITextModel>model).getLanguageIdentifier)) {
canRun = DocumentSymbolProviderRegistry.has(<ITextModel>model);
}
}
return canRun ? true : activeTextEditorWidget !== null ? nls.localize('cannotRunGotoSymbolInFile', "No symbol information for the file") : nls.localize('cannotRunGotoSymbol', "Open a text file first to go to a symbol");
}
getAutoFocus(searchValue: string): IAutoFocus {
searchValue = searchValue.trim();
// Remove any type pattern (:) from search value as needed
if (searchValue.indexOf(SCOPE_PREFIX) === 0) {
searchValue = searchValue.substr(SCOPE_PREFIX.length);
}
return {
autoFocusPrefixMatch: searchValue,
autoFocusFirstEntry: !!searchValue
};
}
private toQuickOpenEntries(flattened: DocumentSymbol[]): SymbolEntry[] {
const results: SymbolEntry[] = [];
for (let i = 0; i < flattened.length; i++) {
const element = flattened[i];
const label = strings.trim(element.name);
// Show parent scope as description
const description = element.containerName || '';
const icon = symbolKindToCssClass(element.kind);
// Add
results.push(new SymbolEntry(i,
label, element.kind, description, `symbol-icon ${icon}`,
element.range, element.selectionRange, [], this.editorService, this
));
}
return results;
}
private getOutline(): Promise<OutlineModel | null> {
if (!this.cachedOutlineRequest) {
this.cachedOutlineRequest = this.doGetActiveOutline();
}
return this.cachedOutlineRequest;
}
private doGetActiveOutline(): Promise<OutlineModel | null> {
const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
if (activeTextEditorWidget) {
let model = activeTextEditorWidget.getModel();
if (model && (<IDiffEditorModel>model).modified && (<IDiffEditorModel>model).original) {
model = (<IDiffEditorModel>model).modified; // Support for diff editor models
}
if (model && types.isFunction((<ITextModel>model).getLanguageIdentifier)) {
return Promise.resolve(asPromise(() => getDocumentSymbols(<ITextModel>model, true, this.pendingOutlineRequest!.token)).then(entries => {
return new OutlineModel(this.toQuickOpenEntries(entries));
}));
}
}
return Promise.resolve(null);
}
decorateOutline(fullRange: IRange, startRange: IRange, editor: IEditor, group: IEditorGroup): void {
editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
const deleteDecorations: string[] = [];
if (this.rangeHighlightDecorationId) {
deleteDecorations.push(this.rangeHighlightDecorationId.lineDecorationId);
deleteDecorations.push(this.rangeHighlightDecorationId.rangeHighlightId);
this.rangeHighlightDecorationId = undefined;
}
const newDecorations: IModelDeltaDecoration[] = [
// rangeHighlight at index 0
{
range: fullRange,
options: {
className: 'rangeHighlight',
isWholeLine: true
}
},
// lineDecoration at index 1
{
range: startRange,
options: {
overviewRuler: {
color: themeColorFromId(overviewRulerRangeHighlight),
position: OverviewRulerLane.Full
}
}
}
];
const decorations = changeAccessor.deltaDecorations(deleteDecorations, newDecorations);
const rangeHighlightId = decorations[0];
const lineDecorationId = decorations[1];
this.rangeHighlightDecorationId = {
groupId: group.id,
rangeHighlightId: rangeHighlightId,
lineDecorationId: lineDecorationId,
};
});
}
private clearDecorations(): void {
const rangeHighlightDecorationId = this.rangeHighlightDecorationId;
if (rangeHighlightDecorationId) {
this.editorService.visibleControls.forEach(editor => {
if (editor.group && editor.group.id === rangeHighlightDecorationId.groupId) {
const editorControl = <IEditor>editor.getControl();
editorControl.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
changeAccessor.deltaDecorations([
rangeHighlightDecorationId.lineDecorationId,
rangeHighlightDecorationId.rangeHighlightId
], []);
});
}
});
this.rangeHighlightDecorationId = undefined;
}
}
onClose(canceled: boolean): void {
// Cancel any pending/cached outline request now
this.clearOutlineRequest();
// Clear Highlight Decorations if present
this.clearDecorations();
// Restore selection if canceled
if (canceled && this.lastKnownEditorViewState) {
const activeTextEditorWidget = this.editorService.activeTextEditorWidget;
if (activeTextEditorWidget) {
activeTextEditorWidget.restoreViewState(this.lastKnownEditorViewState);
}
this.lastKnownEditorViewState = null;
}
}
private clearOutlineRequest(): void {
if (this.pendingOutlineRequest) {
this.pendingOutlineRequest.cancel();
this.pendingOutlineRequest.dispose();
this.pendingOutlineRequest = undefined;
}
this.cachedOutlineRequest = undefined;
}
}