From a1364a621a30665edb0be7fda9d1ec127e751994 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Thu, 4 Jun 2020 18:24:11 +0100
Subject: [PATCH] Tools: Apply linter rules

---
 ElectronClient/gui/NoteEditor/NoteEditor.tsx             | 2 +-
 ElectronClient/gui/NoteEditor/utils/contextMenu.ts       | 4 ++--
 ElectronClient/gui/NoteEditor/utils/useMessageHandler.ts | 2 +-
 ReactNativeClient/lib/services/ResourceEditWatcher.ts    | 2 +-
 ReactNativeClient/lib/services/SettingUtils.ts           | 2 ++
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ElectronClient/gui/NoteEditor/NoteEditor.tsx b/ElectronClient/gui/NoteEditor/NoteEditor.tsx
index e246c5a29a..4d31e61c41 100644
--- a/ElectronClient/gui/NoteEditor/NoteEditor.tsx
+++ b/ElectronClient/gui/NoteEditor/NoteEditor.tsx
@@ -16,6 +16,7 @@ import useMarkupToHtml from './utils/useMarkupToHtml';
 import useFormNote, { OnLoadEvent } from './utils/useFormNote';
 import styles_ from './styles';
 import { NoteEditorProps, FormNote, ScrollOptions, ScrollOptionTypes, OnChangeEvent, NoteBodyEditorProps } from './utils/types';
+import ResourceEditWatcher from '../../lib/services/ResourceEditWatcher';
 
 const { themeStyle } = require('../../theme.js');
 const NoteSearchBar = require('../NoteSearchBar.min.js');
@@ -28,7 +29,6 @@ const { _ } = require('lib/locale');
 const Note = require('lib/models/Note.js');
 const { bridge } = require('electron').remote.require('./bridge');
 const ExternalEditWatcher = require('lib/services/ExternalEditWatcher');
-import ResourceEditWatcher from '../../lib/services/ResourceEditWatcher';
 const eventManager = require('../../eventManager');
 const NoteRevisionViewer = require('../NoteRevisionViewer.min');
 const TagList = require('../TagList.min.js');
diff --git a/ElectronClient/gui/NoteEditor/utils/contextMenu.ts b/ElectronClient/gui/NoteEditor/utils/contextMenu.ts
index e57a5cf072..8eecffe086 100644
--- a/ElectronClient/gui/NoteEditor/utils/contextMenu.ts
+++ b/ElectronClient/gui/NoteEditor/utils/contextMenu.ts
@@ -1,3 +1,5 @@
+import ResourceEditWatcher from '../../../lib/services/ResourceEditWatcher';
+
 const { bridge } = require('electron').remote.require('./bridge');
 const Menu = bridge().Menu;
 const MenuItem = bridge().MenuItem;
@@ -7,8 +9,6 @@ const { clipboard } = require('electron');
 const { toSystemSlashes } = require('lib/path-utils');
 const { _ } = require('lib/locale');
 
-import ResourceEditWatcher from '../../../lib/services/ResourceEditWatcher';
-
 export enum ContextMenuItemType {
 	None = '',
 	Image = 'image',
diff --git a/ElectronClient/gui/NoteEditor/utils/useMessageHandler.ts b/ElectronClient/gui/NoteEditor/utils/useMessageHandler.ts
index 7f4ee9fe9f..465c23c3bc 100644
--- a/ElectronClient/gui/NoteEditor/utils/useMessageHandler.ts
+++ b/ElectronClient/gui/NoteEditor/utils/useMessageHandler.ts
@@ -1,6 +1,7 @@
 import { useCallback } from 'react';
 import { FormNote } from './types';
 import contextMenu from './contextMenu';
+import ResourceEditWatcher from '../../../lib/services/ResourceEditWatcher';
 const BaseItem = require('lib/models/BaseItem');
 const { _ } = require('lib/locale');
 const BaseModel = require('lib/BaseModel.js');
@@ -10,7 +11,6 @@ const { urlDecode } = require('lib/string-utils');
 const urlUtils = require('lib/urlUtils');
 const ResourceFetcher = require('lib/services/ResourceFetcher.js');
 const { reg } = require('lib/registry.js');
-import ResourceEditWatcher from '../../../lib/services/ResourceEditWatcher';
 
 export default function useMessageHandler(scrollWhenReady:any, setScrollWhenReady:Function, editorRef:any, setLocalSearchResultCount:Function, dispatch:Function, formNote:FormNote) {
 	return useCallback(async (event: any) => {
diff --git a/ReactNativeClient/lib/services/ResourceEditWatcher.ts b/ReactNativeClient/lib/services/ResourceEditWatcher.ts
index e092f1932f..5fabbc9d04 100644
--- a/ReactNativeClient/lib/services/ResourceEditWatcher.ts
+++ b/ReactNativeClient/lib/services/ResourceEditWatcher.ts
@@ -1,3 +1,4 @@
+import AsyncActionQueue from '../AsyncActionQueue';
 const { Logger } = require('lib/logger.js');
 const Setting = require('lib/models/Setting');
 const Resource = require('lib/models/Resource');
@@ -6,7 +7,6 @@ const EventEmitter = require('events');
 const chokidar = require('chokidar');
 const { bridge } = require('electron').remote.require('./bridge');
 const { _ } = require('lib/locale');
-import AsyncActionQueue from '../AsyncActionQueue';
 
 interface WatchedItem {
 	resourceId: string,
diff --git a/ReactNativeClient/lib/services/SettingUtils.ts b/ReactNativeClient/lib/services/SettingUtils.ts
index 2d9757dc79..e35c74404f 100644
--- a/ReactNativeClient/lib/services/SettingUtils.ts
+++ b/ReactNativeClient/lib/services/SettingUtils.ts
@@ -1,3 +1,5 @@
+/* eslint-disable import/prefer-default-export */
+
 import KeychainService from './keychain/KeychainService';
 const Setting = require('lib/models/Setting');
 const { uuid } = require('lib/uuid.js');