mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-23 13:20:30 -04:00
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
334
src/vs/workbench/contrib/search/browser/openFileHandler.ts
Normal file
334
src/vs/workbench/contrib/search/browser/openFileHandler.ts
Normal file
@@ -0,0 +1,334 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as errors from 'vs/base/common/errors';
|
||||
import * as nls from 'vs/nls';
|
||||
import { isAbsolute } from 'vs/base/common/path';
|
||||
import * as objects from 'vs/base/common/objects';
|
||||
import { defaultGenerator } from 'vs/base/common/idGenerator';
|
||||
import { URI } from 'vs/base/common/uri';
|
||||
import { basename, dirname } from 'vs/base/common/resources';
|
||||
import { IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
|
||||
import { IModeService } from 'vs/editor/common/services/modeService';
|
||||
import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
|
||||
import { IModelService } from 'vs/editor/common/services/modelService';
|
||||
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
|
||||
import { IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen';
|
||||
import { QuickOpenEntry, QuickOpenModel } from 'vs/base/parts/quickopen/browser/quickOpenModel';
|
||||
import { QuickOpenHandler, EditorQuickOpenEntry } from 'vs/workbench/browser/quickopen';
|
||||
import { QueryBuilder, IFileQueryBuilderOptions } from 'vs/workbench/contrib/search/common/queryBuilder';
|
||||
import { EditorInput, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
|
||||
import { IResourceInput } from 'vs/platform/editor/common/editor';
|
||||
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { ISearchService, IFileSearchStats, IFileQuery, ISearchComplete } from 'vs/workbench/services/search/common/search';
|
||||
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
|
||||
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
|
||||
import { IRange } from 'vs/editor/common/core/range';
|
||||
import { getOutOfWorkspaceEditorResources } from 'vs/workbench/contrib/search/common/search';
|
||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||
import { prepareQuery, IPreparedQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
|
||||
import { IFileService } from 'vs/platform/files/common/files';
|
||||
import { ILabelService } from 'vs/platform/label/common/label';
|
||||
import { untildify } from 'vs/base/common/labels';
|
||||
import { CancellationToken } from 'vs/base/common/cancellation';
|
||||
|
||||
export class FileQuickOpenModel extends QuickOpenModel {
|
||||
|
||||
constructor(entries: QuickOpenEntry[], stats?: IFileSearchStats) {
|
||||
super(entries);
|
||||
}
|
||||
}
|
||||
|
||||
export class FileEntry extends EditorQuickOpenEntry {
|
||||
private range: IRange | null;
|
||||
|
||||
constructor(
|
||||
private resource: URI,
|
||||
private name: string,
|
||||
private description: string,
|
||||
private icon: string,
|
||||
@IEditorService editorService: IEditorService,
|
||||
@IModeService private readonly modeService: IModeService,
|
||||
@IModelService private readonly modelService: IModelService,
|
||||
@IConfigurationService private readonly configurationService: IConfigurationService,
|
||||
@IWorkspaceContextService contextService: IWorkspaceContextService
|
||||
) {
|
||||
super(editorService);
|
||||
}
|
||||
|
||||
getLabel(): string {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
getLabelOptions(): IIconLabelValueOptions {
|
||||
return {
|
||||
extraClasses: getIconClasses(this.modelService, this.modeService, this.resource)
|
||||
};
|
||||
}
|
||||
|
||||
getAriaLabel(): string {
|
||||
return nls.localize('entryAriaLabel', "{0}, file picker", this.getLabel());
|
||||
}
|
||||
|
||||
getDescription(): string {
|
||||
return this.description;
|
||||
}
|
||||
|
||||
getIcon(): string {
|
||||
return this.icon;
|
||||
}
|
||||
|
||||
getResource(): URI {
|
||||
return this.resource;
|
||||
}
|
||||
|
||||
setRange(range: IRange | null): void {
|
||||
this.range = range;
|
||||
}
|
||||
|
||||
mergeWithEditorHistory(): boolean {
|
||||
return true;
|
||||
}
|
||||
|
||||
getInput(): IResourceInput | EditorInput {
|
||||
const input: IResourceInput = {
|
||||
resource: this.resource,
|
||||
options: {
|
||||
pinned: !this.configurationService.getValue<IWorkbenchEditorConfiguration>().workbench.editor.enablePreviewFromQuickOpen,
|
||||
selection: this.range ? this.range : undefined
|
||||
}
|
||||
};
|
||||
|
||||
return input;
|
||||
}
|
||||
}
|
||||
|
||||
export interface IOpenFileOptions {
|
||||
forceUseIcons: boolean;
|
||||
}
|
||||
|
||||
export class OpenFileHandler extends QuickOpenHandler {
|
||||
private options: IOpenFileOptions;
|
||||
private queryBuilder: QueryBuilder;
|
||||
private cacheState: CacheState;
|
||||
|
||||
constructor(
|
||||
@IEditorService private readonly editorService: IEditorService,
|
||||
@IInstantiationService private readonly instantiationService: IInstantiationService,
|
||||
@IWorkbenchThemeService private readonly themeService: IWorkbenchThemeService,
|
||||
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
|
||||
@ISearchService private readonly searchService: ISearchService,
|
||||
@IEnvironmentService private readonly environmentService: IEnvironmentService,
|
||||
@IFileService private readonly fileService: IFileService,
|
||||
@ILabelService private readonly labelService: ILabelService
|
||||
) {
|
||||
super();
|
||||
|
||||
this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
|
||||
}
|
||||
|
||||
setOptions(options: IOpenFileOptions) {
|
||||
this.options = options;
|
||||
}
|
||||
|
||||
getResults(searchValue: string, token: CancellationToken, maxSortedResults?: number): Promise<FileQuickOpenModel> {
|
||||
const query = prepareQuery(searchValue);
|
||||
|
||||
// Respond directly to empty search
|
||||
if (!query.value) {
|
||||
return Promise.resolve(new FileQuickOpenModel([]));
|
||||
}
|
||||
|
||||
// Untildify file pattern
|
||||
query.value = untildify(query.value, this.environmentService.userHome);
|
||||
|
||||
// Do find results
|
||||
return this.doFindResults(query, token, this.cacheState.cacheKey, maxSortedResults);
|
||||
}
|
||||
|
||||
private doFindResults(query: IPreparedQuery, token: CancellationToken, cacheKey?: string, maxSortedResults?: number): Promise<FileQuickOpenModel> {
|
||||
const queryOptions = this.doResolveQueryOptions(query, cacheKey, maxSortedResults);
|
||||
|
||||
let iconClass: string;
|
||||
if (this.options && this.options.forceUseIcons && !this.themeService.getFileIconTheme()) {
|
||||
iconClass = 'file'; // only use a generic file icon if we are forced to use an icon and have no icon theme set otherwise
|
||||
}
|
||||
|
||||
return this.getAbsolutePathResult(query).then(result => {
|
||||
if (token.isCancellationRequested) {
|
||||
return Promise.resolve(<ISearchComplete>{ results: [] });
|
||||
}
|
||||
|
||||
// If the original search value is an existing file on disk, return it immediately and bypass the search service
|
||||
if (result) {
|
||||
return Promise.resolve(<ISearchComplete>{ results: [{ resource: result }] });
|
||||
}
|
||||
|
||||
return this.searchService.fileSearch(this.queryBuilder.file(this.contextService.getWorkspace().folders.map(folder => folder.uri), queryOptions), token);
|
||||
}).then(complete => {
|
||||
const results: QuickOpenEntry[] = [];
|
||||
|
||||
if (!token.isCancellationRequested) {
|
||||
for (const fileMatch of complete.results) {
|
||||
|
||||
const label = basename(fileMatch.resource);
|
||||
const description = this.labelService.getUriLabel(dirname(fileMatch.resource), { relative: true });
|
||||
|
||||
results.push(this.instantiationService.createInstance(FileEntry, fileMatch.resource, label, description, iconClass));
|
||||
}
|
||||
}
|
||||
|
||||
return new FileQuickOpenModel(results, <IFileSearchStats>complete.stats);
|
||||
});
|
||||
}
|
||||
|
||||
private getAbsolutePathResult(query: IPreparedQuery): Promise<URI | undefined> {
|
||||
if (isAbsolute(query.original)) {
|
||||
const resource = URI.file(query.original);
|
||||
|
||||
return this.fileService.resolveFile(resource).then(stat => stat.isDirectory ? undefined : resource, error => undefined);
|
||||
}
|
||||
|
||||
return Promise.resolve(undefined);
|
||||
}
|
||||
|
||||
private doResolveQueryOptions(query: IPreparedQuery, cacheKey?: string, maxSortedResults?: number): IFileQueryBuilderOptions {
|
||||
const queryOptions: IFileQueryBuilderOptions = {
|
||||
_reason: 'openFileHandler',
|
||||
extraFileResources: getOutOfWorkspaceEditorResources(this.editorService, this.contextService),
|
||||
filePattern: query.value,
|
||||
cacheKey
|
||||
};
|
||||
|
||||
if (typeof maxSortedResults === 'number') {
|
||||
queryOptions.maxResults = maxSortedResults;
|
||||
queryOptions.sortByScore = true;
|
||||
}
|
||||
|
||||
return queryOptions;
|
||||
}
|
||||
|
||||
hasShortResponseTime(): boolean {
|
||||
return this.isCacheLoaded;
|
||||
}
|
||||
|
||||
onOpen(): void {
|
||||
this.cacheState = new CacheState(cacheKey => this.cacheQuery(cacheKey), query => this.searchService.fileSearch(query), cacheKey => this.searchService.clearCache(cacheKey), this.cacheState);
|
||||
this.cacheState.load();
|
||||
}
|
||||
|
||||
private cacheQuery(cacheKey: string): IFileQuery {
|
||||
const options: IFileQueryBuilderOptions = {
|
||||
_reason: 'openFileHandler',
|
||||
extraFileResources: getOutOfWorkspaceEditorResources(this.editorService, this.contextService),
|
||||
filePattern: '',
|
||||
cacheKey: cacheKey,
|
||||
maxResults: 0,
|
||||
sortByScore: true,
|
||||
};
|
||||
|
||||
const folderResources = this.contextService.getWorkspace().folders.map(folder => folder.uri);
|
||||
const query = this.queryBuilder.file(folderResources, options);
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
get isCacheLoaded(): boolean {
|
||||
return this.cacheState && this.cacheState.isLoaded;
|
||||
}
|
||||
|
||||
getGroupLabel(): string {
|
||||
return nls.localize('searchResults', "search results");
|
||||
}
|
||||
|
||||
getAutoFocus(searchValue: string): IAutoFocus {
|
||||
return {
|
||||
autoFocusFirstEntry: true
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
enum LoadingPhase {
|
||||
Created = 1,
|
||||
Loading,
|
||||
Loaded,
|
||||
Errored,
|
||||
Disposed
|
||||
}
|
||||
|
||||
/**
|
||||
* Exported for testing.
|
||||
*/
|
||||
export class CacheState {
|
||||
|
||||
private _cacheKey = defaultGenerator.nextId();
|
||||
private query: IFileQuery;
|
||||
|
||||
private loadingPhase = LoadingPhase.Created;
|
||||
private promise: Promise<void>;
|
||||
|
||||
constructor(cacheQuery: (cacheKey: string) => IFileQuery, private doLoad: (query: IFileQuery) => Promise<any>, private doDispose: (cacheKey: string) => Promise<void>, private previous: CacheState | null) {
|
||||
this.query = cacheQuery(this._cacheKey);
|
||||
if (this.previous) {
|
||||
const current = objects.assign({}, this.query, { cacheKey: null });
|
||||
const previous = objects.assign({}, this.previous.query, { cacheKey: null });
|
||||
if (!objects.equals(current, previous)) {
|
||||
this.previous.dispose();
|
||||
this.previous = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
get cacheKey(): string {
|
||||
return this.loadingPhase === LoadingPhase.Loaded || !this.previous ? this._cacheKey : this.previous.cacheKey;
|
||||
}
|
||||
|
||||
get isLoaded(): boolean {
|
||||
const isLoaded = this.loadingPhase === LoadingPhase.Loaded;
|
||||
return isLoaded || !this.previous ? isLoaded : this.previous.isLoaded;
|
||||
}
|
||||
|
||||
get isUpdating(): boolean {
|
||||
const isUpdating = this.loadingPhase === LoadingPhase.Loading;
|
||||
return isUpdating || !this.previous ? isUpdating : this.previous.isUpdating;
|
||||
}
|
||||
|
||||
load(): void {
|
||||
if (this.isUpdating) {
|
||||
return;
|
||||
}
|
||||
this.loadingPhase = LoadingPhase.Loading;
|
||||
this.promise = this.doLoad(this.query)
|
||||
.then(() => {
|
||||
this.loadingPhase = LoadingPhase.Loaded;
|
||||
if (this.previous) {
|
||||
this.previous.dispose();
|
||||
this.previous = null;
|
||||
}
|
||||
}, err => {
|
||||
this.loadingPhase = LoadingPhase.Errored;
|
||||
errors.onUnexpectedError(err);
|
||||
});
|
||||
}
|
||||
|
||||
dispose(): void {
|
||||
if (this.promise) {
|
||||
this.promise.then(undefined, () => { })
|
||||
.then(() => {
|
||||
this.loadingPhase = LoadingPhase.Disposed;
|
||||
return this.doDispose(this._cacheKey);
|
||||
}).then(undefined, err => {
|
||||
errors.onUnexpectedError(err);
|
||||
});
|
||||
} else {
|
||||
this.loadingPhase = LoadingPhase.Disposed;
|
||||
}
|
||||
if (this.previous) {
|
||||
this.previous.dispose();
|
||||
this.previous = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user