Chore: Resolves #8360: Use @typescript-eslint/indent for TypeScript files (#8367)

.eslintrc.js

@@ -108,6 +108,9 @@ module.exports = {
 		'semi': ['error', 'always'],
 		'eol-last': ['error', 'always'],
 		'quotes': ['error', 'single'],
+
+		// Note that "indent" only applies to JavaScript files. See
+		// https://github.com/laurent22/joplin/issues/8360
 		'indent': ['error', 'tab'],
 		'comma-dangle': ['error', {
 			'arrays': 'always-multiline',
@@ -184,6 +187,12 @@ module.exports = {
 				'project': './tsconfig.eslint.json',
 			},
 			'rules': {
+				'@typescript-eslint/indent': ['error', 'tab', {
+					'ignoredNodes': [
+						// See https://github.com/typescript-eslint/typescript-eslint/issues/1824
+						'TSUnionType',
+					],
+				}],
 				'@typescript-eslint/ban-ts-comment': ['error'],
 				'@typescript-eslint/ban-types': 'error',
 				'@typescript-eslint/explicit-member-accessibility': ['error'],

packages/app-mobile/components/NoteEditor/SearchPanel.tsx

@@ -25,9 +25,9 @@ export const defaultSearchState: SearchState = {
 };
 
 export interface SearchPanelProps {
-    searchControl: SearchControl;
+	searchControl: SearchControl;
-    searchState: SearchState;
+	searchState: SearchState;
-    editorSettings: EditorSettings;
+	editorSettings: EditorSettings;
 }
 
 interface ActionButtonProps {

packages/app-mobile/components/NoteEditor/types.ts

@@ -15,9 +15,9 @@ export interface EditorSettings {
 	// [themeStyle(themeId: number)] doesn't work. As such, we need both
 	// the [themeId] and [themeData].
 	themeId: number;
-    themeData: Theme;
+	themeData: Theme;
 
-    katexEnabled: boolean;
+	katexEnabled: boolean;
 	spellcheckEnabled: boolean;
 }
 
@@ -41,14 +41,14 @@ export interface SelectionChangeEvent {
 }
 
 export interface SearchControl {
-    findNext(): void;
+	findNext(): void;
-    findPrevious(): void;
+	findPrevious(): void;
-    replaceCurrent(): void;
+	replaceCurrent(): void;
-    replaceAll(): void;
+	replaceAll(): void;
 	setSearchState(state: SearchState): void;
 
-    showSearch(): void;
+	showSearch(): void;
-    hideSearch(): void;
+	hideSearch(): void;
 }
 
 export interface SearchState {
@@ -57,7 +57,7 @@ export interface SearchState {
 
 	searchText: string;
 	replaceText: string;
-    dialogVisible: boolean;
+	dialogVisible: boolean;
 }
 
 // Possible types of lists in the editor

packages/app-mobile/components/getResponsiveValue.ts

@@ -17,15 +17,15 @@ import { Dimensions } from 'react-native';
 
 export interface ValueMap {
 	// Value to use on small-width displays
-    sm?: number;
+	sm?: number;
 	// Value to use on medium-width displays
-    md?: number;
+	md?: number;
 	// Value to use on large-width displays
-    lg?: number;
+	lg?: number;
 	// Value to use on extra-large width displays
-    xl?: number;
+	xl?: number;
 	// Value to use on extra-extra-large width displays
-    xxl?: number;
+	xxl?: number;
 }
 
 export default function getResponsiveValue(valueMap: ValueMap): number {

packages/app-mobile/utils/setupNotifications.ts

@@ -3,8 +3,8 @@ import { Dispatch } from 'redux';
 const { NativeEventEmitter, NativeModules, Platform } = require('react-native');
 
 interface NotificationData {
-    joplinNotificationId: string;
+	joplinNotificationId: string;
-    noteId: string;
+	noteId: string;
 }
 
 export default async (dispatch: Dispatch) => {

packages/lib/EventDispatcher.test.ts

@@ -1,9 +1,9 @@
 import EventDispatcher from './EventDispatcher';
 
 enum TestKey {
-    FooEvent,
+	FooEvent,
-    BarEvent,
+	BarEvent,
-    BazEvent,
+	BazEvent,
 }
 
 describe('EventDispatcher', () => {

packages/lib/callbackUrlUtils.ts

@@ -19,14 +19,14 @@ export function getTagCallbackUrl(tagId: string) {
 }
 
 export const enum CallbackUrlCommand {
-    OpenNote = 'openNote',
+	OpenNote = 'openNote',
-    OpenFolder = 'openFolder',
+	OpenFolder = 'openFolder',
-    OpenTag = 'openTag',
+	OpenTag = 'openTag',
 }
 
 export interface CallbackUrlInfo {
-    command: CallbackUrlCommand;
+	command: CallbackUrlCommand;
-    params: Record<string, string>;
+	params: Record<string, string>;
 }
 
 export function parseCallbackUrl(s: string): CallbackUrlInfo {

packages/lib/hooks/useElementSize.ts

@@ -3,8 +3,8 @@ const { useCallback, useEffect, useState } = shim.react();
 import useEventListener from './useEventListener';
 
 interface Size {
-  width: number;
+	width: number;
-  height: number;
+	height: number;
 }
 
 function useElementSize(elementRef: any): Size {

packages/lib/migrations/42.ts

@@ -2,7 +2,7 @@ import Setting from '../models/Setting';
 import checkProviderIsSupported from '../utils/webDAVUtils';
 
 interface Script {
-  exec: ()=> Promise<void>;
+	exec: ()=> Promise<void>;
 }
 
 const script: Script = <Script>{};

packages/lib/services/plugins/PluginService.ts

@@ -38,7 +38,7 @@ export interface DefaultPluginSettings {
 }
 
 export interface DefaultPluginsInfo {
-    [pluginId: string]: DefaultPluginSettings;
+	[pluginId: string]: DefaultPluginSettings;
 }
 
 export interface PluginSetting {

packages/lib/services/searchengine/queryBuilder.ts

@@ -9,8 +9,8 @@ interface Term {
 }
 
 enum Relation {
-    OR = 'OR',
+	OR = 'OR',
-    AND = 'AND',
+	AND = 'AND',
 }
 
 enum Operation {

packages/lib/versionInfo.ts

@@ -4,8 +4,8 @@ import { reg } from './registry';
 import { Plugins } from './services/plugins/PluginService';
 
 interface PluginList {
-  completeList: string;
+	completeList: string;
-  summary: string;
+	summary: string;
 }
 
 function getPluginLists(plugins: Plugins): PluginList {

packages/pdf-viewer/hooks/useVisibleOnSelect.ts

@@ -2,9 +2,9 @@ import { useRef, useEffect, MutableRefObject } from 'react';
 
 export interface VisibleOnSelect {
 	container: MutableRefObject<HTMLElement>;
-    wrapperRef: MutableRefObject<HTMLElement>;
+	wrapperRef: MutableRefObject<HTMLElement>;
 	isVisible: boolean;
-    isSelected: boolean;
+	isSelected: boolean;
 }
 
 // Used in thumbnail view, to scroll to the newly selected page.

packages/pdf-viewer/types.ts

@@ -5,9 +5,9 @@ export interface ScaledSize {
 }
 
 export interface IconButtonProps {
-    onClick: ()=> void;
+	onClick: ()=> void;
-    size?: number;
+	size?: number;
-    color?: string;
+	color?: string;
 }
 
 export interface RenderRequest {

packages/pdf-viewer/ui/IconButtons.tsx

@@ -24,12 +24,12 @@ const ButtonElement = styled.button<{ hoverColor?: string; size?: number; color?
 `;
 
 interface BaseButtonProps {
-    icon: IconDefinition;
+	icon: IconDefinition;
-    onClick: ()=> void;
+	onClick: ()=> void;
-    name: string;
+	name: string;
-    size: number;
+	size: number;
-    color: string;
+	color: string;
-    hoverColor?: string;
+	hoverColor?: string;
 }
 
 function BaseButton({ onClick, icon, name, size, color, hoverColor }: BaseButtonProps) {

packages/react-native-saf-x/src/index.ts

@@ -29,66 +29,66 @@ export type Encoding = 'utf8' | 'base64' | 'ascii';
 
 /** Native interface of the module */
 interface SafxInterface {
-  openDocumentTree(persist: boolean): Promise<DocumentFileDetail | null>;
+	openDocumentTree(persist: boolean): Promise<DocumentFileDetail | null>;
-  openDocument(
+	openDocument(
-    persist: boolean,
+		persist: boolean,
-    multiple: boolean,
+		multiple: boolean,
-  ): Promise<DocumentFileDetail[] | null>;
+	): Promise<DocumentFileDetail[] | null>;
-  createDocument(
+	createDocument(
-    data: string,
+		data: string,
-    encoding?: string,
+		encoding?: string,
-    initialName?: string,
+		initialName?: string,
-    mimeType?: string,
+		mimeType?: string,
-  ): Promise<DocumentFileDetail | null>;
+	): Promise<DocumentFileDetail | null>;
-  hasPermission(uriString: string): Promise<boolean>;
+	hasPermission(uriString: string): Promise<boolean>;
-  exists(uriString: string): Promise<boolean>;
+	exists(uriString: string): Promise<boolean>;
-  readFile(uriString: string, encoding?: Encoding): Promise<string>;
+	readFile(uriString: string, encoding?: Encoding): Promise<string>;
-  writeFile(
+	writeFile(
-    uriString: string,
+		uriString: string,
-    data: string,
+		data: string,
-    encoding?: Encoding,
+		encoding?: Encoding,
-    mimeType?: string,
+		mimeType?: string,
-    append?: boolean,
+		append?: boolean,
-  ): Promise<void>;
+	): Promise<void>;
-  createFile(uriString: string, mimeType?: string): Promise<DocumentFileDetail>;
+	createFile(uriString: string, mimeType?: string): Promise<DocumentFileDetail>;
-  unlink(uriString: string): Promise<boolean>;
+	unlink(uriString: string): Promise<boolean>;
-  mkdir(uriString: string): Promise<DocumentFileDetail>;
+	mkdir(uriString: string): Promise<DocumentFileDetail>;
-  rename(uriString: string, newName: string): Promise<DocumentFileDetail>;
+	rename(uriString: string, newName: string): Promise<DocumentFileDetail>;
-  getPersistedUriPermissions(): Promise<string[]>;
+	getPersistedUriPermissions(): Promise<string[]>;
-  releasePersistableUriPermission(uriString: string): Promise<void>;
+	releasePersistableUriPermission(uriString: string): Promise<void>;
-  listFiles(uriString: string): Promise<DocumentFileDetail[]>;
+	listFiles(uriString: string): Promise<DocumentFileDetail[]>;
-  stat(uriString: string): Promise<DocumentFileDetail>;
+	stat(uriString: string): Promise<DocumentFileDetail>;
-  transferFile(
+	transferFile(
-    srcUri: string,
+		srcUri: string,
-    destUri: string,
+		destUri: string,
-    replaceIfDestExist: boolean,
+		replaceIfDestExist: boolean,
-    copy: boolean,
+		copy: boolean,
-  ): Promise<DocumentFileDetail | null>;
+	): Promise<DocumentFileDetail | null>;
 }
 
 export type DocumentFileDetail = {
-  uri: string;
+	uri: string;
-  name: string;
+	name: string;
-  type: 'directory' | 'file';
+	type: 'directory' | 'file';
-  lastModified: number;
+	lastModified: number;
-  mime: string;
+	mime: string;
-  size: number;
+	size: number;
 };
 
 export type FileOperationOptions = {
-  /** Defaults to `'utf8'` */
+	/** Defaults to `'utf8'` */
-  encoding?: Encoding;
+	encoding?: Encoding;
 
-  /** Append data to the file. If not set file content will be overwritten. */
+	/** Append data to the file. If not set file content will be overwritten. */
-  append?: boolean;
+	append?: boolean;
 
-  /** mime type of the file being saved. Defaults to '\*\/\*' */
+	/** mime type of the file being saved. Defaults to '\*\/\*' */
-  mimeType?: string;
+	mimeType?: string;
 };
 
 export type CreateDocumentOptions = FileOperationOptions & {
-  /** initial display name when opening file picker */
+	/** initial display name when opening file picker */
-  initialName?: string;
+	initialName?: string;
 };
 
 // Open the Document Picker to select a folder. Read/Write Permission will be granted to the selected folder.
@@ -98,10 +98,10 @@ export function openDocumentTree(persist: boolean) {
 }
 
 export type OpenDocumentOptions = {
-  /** should the permission of returned document(s) be persisted ? */
+	/** should the permission of returned document(s) be persisted ? */
-  persist?: boolean;
+	persist?: boolean;
-  /** should the file picker allow multiple documents ? */
+	/** should the file picker allow multiple documents ? */
-  multiple?: boolean;
+	multiple?: boolean;
 };
 
 // Open the Document Picker to select a file.
@@ -206,7 +206,7 @@ export function stat(uriString: string) {
 }
 
 type FileTransferOptions = {
-  replaceIfDestinationExists?: boolean;
+	replaceIfDestinationExists?: boolean;
 };
 
 // Copy file from source uri to destination uri.

packages/server/src/db.ts

@@ -18,9 +18,9 @@ require('pg').types.setTypeParser(20, (val: any) => {
 // Also need this to get integers for count() queries.
 // https://knexjs.org/#Builder-count
 declare module 'knex/types/result' {
-    interface Registry {
+	interface Registry {
-        Count: number;
+		Count: number;
-    }
+	}
 }
 
 const logger = Logger.create('db');

packages/server/src/services/database/types.ts

@@ -12,7 +12,7 @@ export enum NotificationLevel {
 }
 
 export enum ItemType {
-    Item = 1,
+	Item = 1,
 	UserItem = 2,
 	User,
 }

packages/tools/bundleDefaultPlugins.ts

@@ -6,7 +6,7 @@ import { execCommand } from '@joplin/utils';
 const fetch = require('node-fetch');
 
 interface PluginAndVersion {
-   [pluginId: string]: string;
+	[pluginId: string]: string;
 }
 
 interface PluginIdAndName {