Skip to content

V
Vscode

徽霖 / Vscode

通知 9
Star 0
Fork 0
V
Vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 59cf7a96 编写于 作者: B Benjamin Pasero
浏览文件
操作

let => const

上级 9f3efd44
隐藏空白更改
内联 并排
Showing with 44 addition and 44 deletion
src/vs/base/parts/quickopen/browser/quickOpenModel.ts
浏览文件 @ 59cf7a96
......@@ -181,8 +181,8 @@ export class QuickOpenEntry {
let nameA = elementA.getLabel();
let nameB = elementB.getLabel();
if (nameA === nameB) {
let resourceA = elementA.getResource();
let resourceB = elementB.getResource();
const resourceA = elementA.getResource();
const resourceB = elementB.getResource();
if (resourceA && resourceB) {
nameA = resourceA.fsPath;
......@@ -202,7 +202,7 @@ export class QuickOpenEntry {
*/
public static highlight(entry: QuickOpenEntry, lookFor: string, fuzzyHighlight = false): { labelHighlights: IHighlight[], descriptionHighlights: IHighlight[] } {
let labelHighlights: IHighlight[] = [];
let descriptionHighlights: IHighlight[] = [];
const descriptionHighlights: IHighlight[] = [];
const normalizedLookFor = strings.stripWildcards(lookFor);
const label = entry.getLabel();
......@@ -219,7 +219,7 @@ export class QuickOpenEntry {
// Fuzzy/Full-Path: Highlight is special
else if (fuzzyHighlight || lookFor.indexOf(paths.nativeSep) >= 0) {
let candidateLabelHighlights = filters.matchesFuzzy(lookFor, label, fuzzyHighlight);
const candidateLabelHighlights = filters.matchesFuzzy(lookFor, label, fuzzyHighlight);
if (!candidateLabelHighlights) {
const pathPrefix = description ? (description + paths.nativeSep) : '';
const pathPrefixLength = pathPrefix.length;
......@@ -488,41 +488,41 @@ class Renderer implements IRenderer<QuickOpenEntry> {
// Action Bar
DOM.addClass(container, 'actions');
let entryContainer = document.createElement('div');
const entryContainer = document.createElement('div');
DOM.addClass(entryContainer, 'sub-content');
container.appendChild(entryContainer);
let actionBarContainer = document.createElement('div');
const actionBarContainer = document.createElement('div');
DOM.addClass(actionBarContainer, 'primary-action-bar');
container.appendChild(actionBarContainer);
let actionBar = new ActionBar(actionBarContainer, {
const actionBar = new ActionBar(actionBarContainer, {
actionRunner: this.actionRunner
});
// Entry
let entry = document.createElement('div');
const entry = document.createElement('div');
DOM.addClass(entry, 'quick-open-entry');
entryContainer.appendChild(entry);
// Icon
let icon = document.createElement('span');
const icon = document.createElement('span');
entry.appendChild(icon);
// Label
let label = new HighlightedLabel(entry);
const label = new HighlightedLabel(entry);
// Description
let descriptionContainer = document.createElement('span');
const descriptionContainer = document.createElement('span');
entry.appendChild(descriptionContainer);
DOM.addClass(descriptionContainer, 'quick-open-entry-description');
let description = new HighlightedLabel(descriptionContainer);
const description = new HighlightedLabel(descriptionContainer);
// Detail
let detailContainer = document.createElement('div');
const detailContainer = document.createElement('div');
entry.appendChild(detailContainer);
DOM.addClass(detailContainer, 'quick-open-entry-meta');
let detail = new HighlightedLabel(detailContainer);
const detail = new HighlightedLabel(detailContainer);
return {
container,
......@@ -544,7 +544,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
return;
}
let data: IQuickOpenEntryTemplateData = templateData;
const data: IQuickOpenEntryTemplateData = templateData;
// Action Bar
if (this.actionProvider.hasActions(null, entry)) {
......@@ -567,7 +567,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
// Entry group
if (entry instanceof QuickOpenEntryGroup) {
let group = <QuickOpenEntryGroup>entry;
const group = <QuickOpenEntryGroup>entry;
// Border
if (group.showBorder()) {
......@@ -577,16 +577,16 @@ class Renderer implements IRenderer<QuickOpenEntry> {
}
// Group Label
let groupLabel = group.getGroupLabel() || '';
const groupLabel = group.getGroupLabel() || '';
(<IQuickOpenEntryGroupTemplateData>templateData).group.textContent = groupLabel;
}
// Normal Entry
if (entry instanceof QuickOpenEntry) {
let [labelHighlights, descriptionHighlights, detailHighlights] = entry.getHighlights();
const [labelHighlights, descriptionHighlights, detailHighlights] = entry.getHighlights();
// Extra Class
let extraClass = entry.getExtraClass();
const extraClass = entry.getExtraClass();
if (extraClass) {
DOM.addClass(data.entry, extraClass);
} else {
......@@ -594,7 +594,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
}
// Icon
let iconClass = entry.getIcon() ? ('quick-open-entry-icon ' + entry.getIcon()) : '';
const iconClass = entry.getIcon() ? ('quick-open-entry-icon ' + entry.getIcon()) : '';
data.icon.className = iconClass;
// Label
......
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
浏览文件 @ 59cf7a96
......@@ -121,7 +121,7 @@ export class QuickOpenWidget implements IModelProvider {
// Eventing
div.on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
let keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
if (keyboardEvent.keyCode === KeyCode.Escape) {
DOM.EventHelper.stop(e, true);
......@@ -151,7 +151,7 @@ export class QuickOpenWidget implements IModelProvider {
this.inputElement.setAttribute('aria-autocomplete', 'list');
DOM.addDisposableListener(this.inputBox.inputElement, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
let keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
// Do not handle Tab: It is used to navigate between elements without mouse
if (keyboardEvent.keyCode === KeyCode.Tab) {
......@@ -169,7 +169,7 @@ export class QuickOpenWidget implements IModelProvider {
else if (keyboardEvent.keyCode === KeyCode.Enter) {
DOM.EventHelper.stop(e, true);
let focus = this.tree.getFocus();
const focus = this.tree.getFocus();
if (focus) {
this.elementSelected(focus, e);
}
......@@ -218,7 +218,7 @@ export class QuickOpenWidget implements IModelProvider {
}));
}).
on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
let keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
// Only handle when in quick navigation mode
if (!this.quickNavigateConfiguration) {
......@@ -233,8 +233,8 @@ export class QuickOpenWidget implements IModelProvider {
}
}).
on(DOM.EventType.KEY_UP, (e: KeyboardEvent) => {
let keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
let keyCode = keyboardEvent.keyCode;
const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
const keyCode = keyboardEvent.keyCode;
// Only handle when in quick navigation mode
if (!this.quickNavigateConfiguration) {
......@@ -242,8 +242,8 @@ export class QuickOpenWidget implements IModelProvider {
}
// Select element when keys are pressed that signal it
let quickNavKeys = this.quickNavigateConfiguration.keybindings;
let wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some((k) => {
const quickNavKeys = this.quickNavigateConfiguration.keybindings;
const wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some((k) => {
if (k.hasShift() && keyCode === KeyCode.Shift) {
if (keyboardEvent.ctrlKey || keyboardEvent.altKey || keyboardEvent.metaKey) {
return false; // this is an optimistic check for the shift key being used to navigate back in quick open
......@@ -282,7 +282,7 @@ export class QuickOpenWidget implements IModelProvider {
});
if (wasTriggerKeyPressed) {
let focus = this.tree.getFocus();
const focus = this.tree.getFocus();
if (focus) {
this.elementSelected(focus, e);
}
......@@ -303,7 +303,7 @@ export class QuickOpenWidget implements IModelProvider {
}
private onType(): void {
let value = this.inputBox.value;
const value = this.inputBox.value;
// Adjust help text as needed if present
if (this.helpText) {
......@@ -411,8 +411,8 @@ export class QuickOpenWidget implements IModelProvider {
// add telemetry when an item is accepted, logging the index of the item in the list and the length of the list
// to measure the rate of the success and the relevance of the order
if (this.usageLogger) {
let indexOfAcceptedElement = this.model.entries.indexOf(value);
let entriesCount = this.model.entries.length;
const indexOfAcceptedElement = this.model.entries.indexOf(value);
const entriesCount = this.model.entries.length;
this.usageLogger.publicLog('quickOpenWidgetItemAccepted', { index: indexOfAcceptedElement, count: entriesCount, isQuickNavigate: this.quickNavigateConfiguration ? true : false });
}
......@@ -516,10 +516,10 @@ export class QuickOpenWidget implements IModelProvider {
if (autoFocus.autoFocusPrefixMatch) {
let caseSensitiveMatch: any;
let caseInsensitiveMatch: any;
let prefix = autoFocus.autoFocusPrefixMatch;
let lowerCasePrefix = prefix.toLowerCase();
const prefix = autoFocus.autoFocusPrefixMatch;
const lowerCasePrefix = prefix.toLowerCase();
for (let i = 0; i < entries.length; i++) {
let entry = entries[i];
const entry = entries[i];
const label = input.dataSource.getLabel(entry);
if (!caseSensitiveMatch && label.indexOf(prefix) === 0) {
......@@ -533,7 +533,7 @@ export class QuickOpenWidget implements IModelProvider {
}
}
let entryToFocus = caseSensitiveMatch || caseInsensitiveMatch;
const entryToFocus = caseSensitiveMatch || caseInsensitiveMatch;
if (entryToFocus) {
this.tree.setFocus(entryToFocus);
this.tree.reveal(entryToFocus, 0).done(null, errors.onUnexpectedError);
......@@ -599,7 +599,7 @@ export class QuickOpenWidget implements IModelProvider {
const renderer = input.renderer;
if (!input) {
let itemHeight = renderer.getHeight(null);
const itemHeight = renderer.getHeight(null);
return this.options.minItemsToShow ? this.options.minItemsToShow * itemHeight : 0;
}
......@@ -615,10 +615,10 @@ export class QuickOpenWidget implements IModelProvider {
preferredItemsHeight = QuickOpenWidget.MAX_ITEMS_HEIGHT;
}
let entries = input.entries.filter(e => this.isElementVisible(input, e));
let maxEntries = this.options.maxItemsToShow || entries.length;
const entries = input.entries.filter(e => this.isElementVisible(input, e));
const maxEntries = this.options.maxItemsToShow || entries.length;
for (let i = 0; i < maxEntries && i < entries.length; i++) {
let entryHeight = renderer.getHeight(entries[i]);
const entryHeight = renderer.getHeight(entries[i]);
if (height + entryHeight <= preferredItemsHeight) {
height += entryHeight;
} else {
......@@ -641,7 +641,7 @@ export class QuickOpenWidget implements IModelProvider {
// report failure cases
if (reason === HideReason.CANCELED) {
if (this.model) {
let entriesCount = this.model.entries.filter(e => this.isElementVisible(this.model, e)).length;
const entriesCount = this.model.entries.filter(e => this.isElementVisible(this.model, e)).length;
if (this.usageLogger) {
this.usageLogger.publicLog('quickOpenWidgetCancelled', { count: entriesCount, isQuickNavigate: this.quickNavigateConfiguration ? true : false });
}
......@@ -762,7 +762,7 @@ export class QuickOpenWidget implements IModelProvider {
public accept(): void {
if (this.isVisible()) {
let focus = this.tree.getFocus();
const focus = this.tree.getFocus();
if (focus) {
this.elementSelected(focus);
}
......@@ -774,7 +774,7 @@ export class QuickOpenWidget implements IModelProvider {
}
public setExtraClass(clazz: string): void {
let previousClass = this.builder.getProperty('extra-class');
const previousClass = this.builder.getProperty('extra-class');
if (previousClass) {
this.builder.removeClass(previousClass);
}
......@@ -795,7 +795,7 @@ export class QuickOpenWidget implements IModelProvider {
this.layoutDimensions = dimension;
// Apply to quick open width (height is dynamic by number of items to show)
let quickOpenWidth = Math.min(this.layoutDimensions.width * 0.62 /* golden cut */, QuickOpenWidget.MAX_WIDTH);
const quickOpenWidth = Math.min(this.layoutDimensions.width * 0.62 /* golden cut */, QuickOpenWidget.MAX_WIDTH);
if (this.builder) {
// quick open
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或