GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-10-04 05:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

reenabled @typescript-eslint/no-unnecessary-condition

Browse Source
This commit is contained in:
Eugene Pankov
2021-01-02 20:10:00 +01:00
parent 946f4292ef
commit 4d9cc91e91
36 changed files with 197 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
terminus-core/src/api/hotkeyProvider.ts
View File

@@ -8,7 +8,5 @@ export interface HotkeyDescription {
* must also provide the `hotkeys.foo` config options with the default values
*/
export abstract class HotkeyProvider {
hotkeys: HotkeyDescription[] = []
abstract provide (): Promise<HotkeyDescription[]>
}

4
terminus-core/src/components/selectorModal.component.ts
View File

@@ -72,7 +72,7 @@ export class SelectorModalComponent<T> {
this.modalInstance.dismiss()
}
iconIsSVG (icon: string): boolean {
return icon?.startsWith('<')
iconIsSVG (icon?: string): boolean {
return icon?.startsWith('<') ?? false
}
}

20
terminus-core/src/components/splitTab.component.ts
View File

@@ -161,7 +161,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
_allFocusMode = false
/** @hidden */
private focusedTab: BaseTabComponent
private focusedTab: BaseTabComponent|null = null
private maximizedTab: BaseTabComponent|null = null
private hotkeysSubscription: Subscription
private viewRefs: Map<BaseTabComponent, EmbeddedViewRef<any>> = new Map()
@@ -211,7 +211,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
this.blurred$.subscribe(() => this.getAllTabs().forEach(x => x.emitBlurred()))
this.hotkeysSubscription = this.hotkeys.matchedHotkey.subscribe(hotkey => {
if (!this.hasFocus) {
if (!this.hasFocus || !this.focusedTab) {
return
}
switch (hotkey) {
@@ -280,7 +280,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
return this.root.getAllTabs()
}
getFocusedTab (): BaseTabComponent {
getFocusedTab (): BaseTabComponent|null {
return this.focusedTab
}
@@ -295,10 +295,8 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
x.emitBlurred()
}
}
if (tab) {
tab.emitFocused()
this.focusChanged.next(tab)
}
tab.emitFocused()
this.focusChanged.next(tab)
if (this.maximizedTab !== tab) {
this.maximizedTab = null
@@ -314,7 +312,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
/**
* Focuses the first available tab inside the given [[SplitContainer]]
*/
focusAnyIn (parent: BaseTabComponent | SplitContainer): void {
focusAnyIn (parent?: BaseTabComponent | SplitContainer): void {
if (!parent) {
return
}
@@ -398,6 +396,10 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
* Moves focus in the given direction
*/
navigate (dir: SplitDirection): void {
if (!this.focusedTab) {
return
}
let rel: BaseTabComponent | SplitContainer = this.focusedTab
let parent = this.getParentOf(rel)
if (!parent) {
@@ -598,7 +600,7 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
@Injectable()
export class SplitTabRecoveryProvider extends TabRecoveryProvider {
async recover (recoveryToken: RecoveryToken): Promise<RecoveredTab|null> {
if (recoveryToken && recoveryToken.type === 'app:split-tab') {
if (recoveryToken.type === 'app:split-tab') {
return {
type: SplitTabComponent,
options: { _recoveredState: recoveryToken },

2
terminus-core/src/components/startPage.component.ts
View File

@@ -29,7 +29,7 @@ export class StartPageComponent {
.sort((a: ToolbarButton, b: ToolbarButton) => (a.weight ?? 0) - (b.weight ?? 0))
}
sanitizeIcon (icon: string): any {
sanitizeIcon (icon?: string): any {
return this.domSanitizer.bypassSecurityTrustHtml(icon ?? '')
}
}

28
terminus-core/src/services/app.service.ts
View File

@@ -46,10 +46,10 @@ class CompletionObserver {
export class AppService {
tabs: BaseTabComponent[] = []
get activeTab (): BaseTabComponent { return this._activeTab }
get activeTab (): BaseTabComponent|null { return this._activeTab ?? null }
private lastTabIndex = 0
private _activeTab: BaseTabComponent
private _activeTab?: BaseTabComponent
private closedTabsStack: RecoveryToken[] = []
private activeTabChange = new Subject<BaseTabComponent>()
@@ -190,7 +190,7 @@ export class AppService {
this._activeTab.emitFocused()
return
}
if (this.tabs.includes(this._activeTab)) {
if (this._activeTab && this.tabs.includes(this._activeTab)) {
this.lastTabIndex = this.tabs.indexOf(this._activeTab)
} else {
this.lastTabIndex = 0
@@ -201,12 +201,10 @@ export class AppService {
}
this._activeTab = tab
this.activeTabChange.next(tab)
if (this._activeTab) {
setImmediate(() => {
this._activeTab.emitFocused()
})
this.hostApp.setTitle(this._activeTab.title)
}
setImmediate(() => {
this._activeTab?.emitFocused()
})
this.hostApp.setTitle(this._activeTab.title)
}
getParentTab (tab: BaseTabComponent): SplitTabComponent|null {
@@ -229,6 +227,9 @@ export class AppService {
}
nextTab (): void {
if (!this._activeTab) {
return
}
if (this.tabs.length > 1) {
const tabIndex = this.tabs.indexOf(this._activeTab)
if (tabIndex < this.tabs.length - 1) {
@@ -240,6 +241,9 @@ export class AppService {
}
previousTab (): void {
if (!this._activeTab) {
return
}
if (this.tabs.length > 1) {
const tabIndex = this.tabs.indexOf(this._activeTab)
if (tabIndex > 0) {
@@ -251,6 +255,9 @@ export class AppService {
}
moveSelectedTabLeft (): void {
if (!this._activeTab) {
return
}
if (this.tabs.length > 1) {
const tabIndex = this.tabs.indexOf(this._activeTab)
if (tabIndex > 0) {
@@ -262,6 +269,9 @@ export class AppService {
}
moveSelectedTabRight (): void {
if (!this._activeTab) {
return
}
if (this.tabs.length > 1) {
const tabIndex = this.tabs.indexOf(this._activeTab)
if (tabIndex < this.tabs.length - 1) {

5
terminus-core/src/services/config.service.ts
View File

@@ -109,10 +109,7 @@ export class ConfigService {
) {
this.path = path.join(electron.app.getPath('userData'), 'config.yaml')
this.defaults = configProviders.map(provider => {
let defaults = {}
if (provider.platformDefaults) {
defaults = configMerge(defaults, provider.platformDefaults[hostApp.platform] || {})
}
let defaults = provider.platformDefaults[hostApp.platform] || {}
if (provider.defaults) {
defaults = configMerge(defaults, provider.defaults)
}

1
terminus-core/src/services/docking.service.ts
View File

@@ -26,6 +26,7 @@ export class DockingService {
let display = this.electron.screen.getAllDisplays()
.filter(x => x.id === this.config.store.appearance.dockScreen)[0]
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (!display) {
display = this.getCurrentScreen()
}

4
terminus-core/src/services/hotkeys.service.ts
View File

@@ -172,7 +172,7 @@ export class HotkeysService {
return (
await Promise.all(
this.config.enabledServices(this.hotkeyProviders)
.map(async x => x.provide ? x.provide() : x.hotkeys)
.map(async x => x.provide())
)
).reduce((a, b) => a.concat(b))
}
@@ -222,7 +222,7 @@ export class HotkeysService {
if (!(value instanceof Array)) {
continue
}
if (value) {
if (value.length > 0) {
value = value.map((item: string | string[]) => typeof item === 'string' ? [item] : item)
keys[key] = value
}

4
terminus-core/src/services/log.service.ts
View File

@@ -54,9 +54,7 @@ export class Logger {
private doLog (level: string, ...args: any[]): void {
console[level](`%c[${this.name}]`, 'color: #aaa', ...args)
if (this.winstonLogger) {
this.winstonLogger[level](...args)
}
this.winstonLogger[level](...args)
}
}

31
terminus-core/src/services/tabRecovery.service.ts
View File

@@ -11,7 +11,7 @@ export class TabRecoveryService {
enabled = false
private constructor (
@Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider[],
@Inject(TabRecoveryProvider) private tabRecoveryProviders: TabRecoveryProvider[]|null,
private config: ConfigService,
log: LogService
) {
@@ -23,30 +23,23 @@ export class TabRecoveryService {
return
}
window.localStorage.tabsRecovery = JSON.stringify(
await Promise.all(
(await Promise.all(
tabs
.map(tab => {
let token = tab.getRecoveryToken()
if (token) {
token = token.then(r => {
if (r) {
r.tabTitle = tab.title
if (tab.color) {
r.tabColor = tab.color
}
}
return r
})
.map(async tab => tab.getRecoveryToken().then(r => {
if (r) {
r.tabTitle = tab.title
if (tab.color) {
r.tabColor = tab.color
}
}
return token
})
.filter(token => !!token)
)
return r
}))
)).filter(token => !!token)
)
}
async recoverTab (token: RecoveryToken): Promise<RecoveredTab|null> {
for (const provider of this.config.enabledServices(this.tabRecoveryProviders)) {
for (const provider of this.config.enabledServices(this.tabRecoveryProviders ?? [])) {
try {
const tab = await provider.recover(token)
if (tab !== null) {

7
terminus-core/src/services/touchbar.service.ts
View File

@@ -33,6 +33,7 @@ export class TouchbarService {
app.tabOpened$.subscribe(tab => {
tab.titleChange$.subscribe(title => {
const segment = this.tabSegments[app.tabs.indexOf(tab)]
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (segment) {
segment.label = this.shortenTitle(title)
this.tabsSegmentedControl.segments = this.tabSegments
@@ -41,6 +42,7 @@ export class TouchbarService {
tab.activity$.subscribe(hasActivity => {
const showIcon = this.app.activeTab !== tab && hasActivity
const segment = this.tabSegments[app.tabs.indexOf(tab)]
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (segment) {
segment.icon = showIcon ? activityIcon : undefined
}
@@ -53,7 +55,7 @@ export class TouchbarService {
label: this.shortenTitle(tab.title),
}))
this.tabsSegmentedControl.segments = this.tabSegments
this.tabsSegmentedControl.selectedIndex = this.app.tabs.indexOf(this.app.activeTab)
this.tabsSegmentedControl.selectedIndex = this.app.activeTab ? this.app.tabs.indexOf(this.app.activeTab) : 0
}
update (): void {
@@ -73,7 +75,7 @@ export class TouchbarService {
this.tabsSegmentedControl = new this.electron.TouchBar.TouchBarSegmentedControl({
segments: this.tabSegments,
selectedIndex: this.app.tabs.indexOf(this.app.activeTab),
selectedIndex: this.app.activeTab ? this.app.tabs.indexOf(this.app.activeTab) : undefined,
change: (selectedIndex) => this.zone.run(() => {
this.app.selectTab(this.app.tabs[selectedIndex])
}),
@@ -109,6 +111,7 @@ export class TouchbarService {
}
private getCachedNSImage (name: string) {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (!this.nsImageCache[name]) {
this.nsImageCache[name] = this.electron.nativeImage.createFromNamedImage(name, [0, 0, 1])
}

2
terminus-core/src/tabContextMenu.ts
View File

@@ -113,7 +113,7 @@ export class CommonOptionsContextMenu extends TabContextMenuItemProvider {
...items,
{
label: 'Rename',
click: () => this.zone.run(() => tabHeader?.showRenameTabModal()),
click: () => this.zone.run(() => tabHeader.showRenameTabModal()),
},
{
label: 'Duplicate',