提交 59cf7a96 编写于 作者: B Benjamin Pasero

let => const

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