Modularization: Switch to 'oni-core-logging' (#2283)

* Start migrating from Log.ts -> oni-core-logging

* Refactor remaining references

* Fix lint issues

Author: bryphe

browser/src/App.ts

@@ -11,7 +11,7 @@ import * as path from "path"
 
 import { IDisposable } from "oni-types"
 
-import * as Log from "./Log"
+import * as Log from "oni-core-logging"
 import * as Performance from "./Performance"
 import * as Utility from "./Utility"
 

browser/src/Editor/BufferManager.ts

@@ -18,6 +18,7 @@ import { Store } from "redux"
 import * as detectIndent from "detect-indent"
 
 import * as Oni from "oni-api"
+import * as Log from "oni-core-logging"
 
 import {
     BufferEventContext,
@@ -38,7 +39,6 @@ import * as Actions from "./NeovimEditor/NeovimEditorActions"
 import * as State from "./NeovimEditor/NeovimEditorStore"
 
 import * as Constants from "./../Constants"
-import * as Log from "./../Log"
 import { TokenColor } from "./../Services/TokenColors"
 
 import { IBufferLayer } from "./NeovimEditor/BufferLayerManager"

browser/src/Editor/NeovimEditor/NeovimEditor.tsx

@@ -20,10 +20,9 @@ import { bindActionCreators, Store } from "redux"
 import { clipboard, ipcRenderer } from "electron"
 
 import * as Oni from "oni-api"
+import * as Log from "oni-core-logging"
 import { Event, IEvent } from "oni-types"
 
-import * as Log from "./../../Log"
-
 import { addDefaultUnitIfNeeded } from "./../../Font"
 import {
     BufferEventContext,

browser/src/Editor/NeovimEditor/Rename.tsx

@@ -5,8 +5,8 @@
 import * as React from "react"
 
 import * as Oni from "oni-api"
+import * as Log from "oni-core-logging"
 
-import * as Log from "./../../Log"
 import * as Helpers from "./../../Plugins/Api/LanguageClient/LanguageClientHelpers"
 
 import { LanguageManager } from "./../../Services/Language"

browser/src/Editor/NeovimEditor/markdown.ts

@@ -1,7 +1,7 @@
 import { unescape } from "lodash"
 import * as marked from "marked"
 
-import * as Log from "./../../Log"
+import * as Log from "oni-core-logging"
 import { IGrammarPerLine, IGrammarToken } from "./../../Services/SyntaxHighlighting/TokenGenerator"
 
 import * as DOMPurify from "dompurify"

browser/src/Editor/OniEditor/OniEditor.tsx

@@ -12,12 +12,12 @@ import * as React from "react"
 import * as types from "vscode-languageserver-types"
 
 import * as Oni from "oni-api"
+import * as Log from "oni-core-logging"
 import { IEvent } from "oni-types"
 
 // import { remote } from "electron"
 
 import * as App from "./../../App"
-import * as Log from "./../../Log"
 import * as Utility from "./../../Utility"
 
 import { PluginManager } from "./../../Plugins/PluginManager"

browser/src/Input/Keyboard/KeyboardLayout.ts

@@ -1,6 +1,6 @@
+import * as Log from "oni-core-logging"
 import { Event, IEvent } from "oni-types"
 
-import * as Log from "./../../Log"
 import * as Platform from "./../../Platform"
 
 export interface IKeyMap {

browser/src/Input/Keyboard/KeyboardResolver.ts

@@ -3,10 +3,9 @@
  *
  * Manages set of resolvers, and adding/removing resolvers.
  */
+import * as Log from "oni-core-logging"
 import { IDisposable } from "oni-types"
 
-import * as Log from "./../../Log"
-
 import { KeyResolver } from "./Resolvers"
 
 export class KeyboardResolver {

browser/src/Log.ts

@@ -1,5 +1,5 @@
+import * as Log from "oni-core-logging"
 import * as Constants from "./Constants"
-import * as Log from "./Log"
 
 // IPeriodicJob implements the interface for a long-running job
 // that would be expensive to run synchronously, so it is

browser/src/PeriodicJobs.ts

@@ -6,7 +6,7 @@
 
 import { remote } from "electron"
 
-import * as Log from "./Log"
+import * as Log from "oni-core-logging"
 
 // We need to use the 'main process' version of electron-settings.
 // See: https://github.com/nathanbuchar/electron-settings/wiki/FAQs

browser/src/PersistentStore.ts

@@ -4,7 +4,7 @@
  * Helper utility for handling logging from language service clients
  */
 
-import * as Log from "./../../../Log"
+import * as Log from "oni-core-logging"
 
 export class LanguageClientLogger {
     public error(message: string): void {

browser/src/Plugins/Api/LanguageClient/LanguageClientLogger.ts

@@ -8,6 +8,7 @@
 import * as ChildProcess from "child_process"
 
 import * as OniApi from "oni-api"
+import * as Log from "oni-core-logging"
 
 import Process from "./Process"
 import { Services } from "./Services"
@@ -38,8 +39,6 @@ import { getInstance as getTokenColorsInstance } from "./../../Services/TokenCol
 import { windowManager } from "./../../Services/WindowManager"
 import { getInstance as getWorkspaceInstance } from "./../../Services/Workspace"
 
-import * as Log from "./../../Log"
-
 import * as throttle from "lodash/throttle"
 
 const react = require("react") // tslint:disable-line no-var-requires

browser/src/Plugins/Api/Oni.ts

@@ -1,7 +1,8 @@
 import * as ChildProcess from "child_process"
 
 import * as Oni from "oni-api"
-import * as Log from "./../../Log"
+import * as Log from "oni-core-logging"
+
 import * as Platform from "./../../Platform"
 import { configuration } from "./../../Services/Configuration"
 

browser/src/Plugins/Api/Process.ts

@@ -7,9 +7,9 @@
 import * as fs from "fs"
 import * as path from "path"
 
-import * as Capabilities from "./Api/Capabilities"
+import * as Log from "oni-core-logging"
 
-import * as Log from "./../Log"
+import * as Capabilities from "./Api/Capabilities"
 
 const remapToAbsolutePaths = (
     packageRoot: string,

browser/src/Plugins/PackageMetadataParser.ts

@@ -1,7 +1,7 @@
 import * as fs from "fs"
 import * as path from "path"
 
-import * as Log from "./../Log"
+import * as Log from "oni-core-logging"
 
 import * as Capabilities from "./Api/Capabilities"
 import { Oni } from "./Api/Oni"

browser/src/Plugins/Plugin.ts

@@ -4,7 +4,7 @@
  * Responsible for synchronizing user's `plugin` configuration settings.
  */
 
-import * as Log from "./../Log"
+import * as Log from "oni-core-logging"
 
 import { Configuration } from "./../Services/Configuration"
 import { PluginManager } from "./PluginManager"

browser/src/Plugins/PluginConfigurationSynchronizer.ts

@@ -6,6 +6,7 @@
 
 import * as path from "path"
 
+import * as Log from "oni-core-logging"
 import { Event, IEvent } from "oni-types"
 
 // import * as Oni from "oni-api"
@@ -20,8 +21,6 @@ import { IFileSystem, OniFileSystem } from "./../Services/Explorer/ExplorerFileS
 
 import Process from "./Api/Process"
 
-import * as Log from "./../Log"
-
 /**
  * Plugin identifier:
  * - For _git_, this should be of the form `welle/targets.vim`

browser/src/Plugins/PluginInstaller.ts

@@ -6,7 +6,7 @@
 
 import { Store } from "redux"
 
-import * as Log from "./../Log"
+import * as Log from "oni-core-logging"
 
 export const createLoggingMiddleware = (storeName: string) => (store: Store<any>) => (
     next: any,

browser/src/Redux/LoggingMiddleware.ts

@@ -5,6 +5,7 @@
  */
 
 import * as Oni from "oni-api"
+import * as Log from "oni-core-logging"
 
 import { IBuffer } from "./../Editor/BufferManager"
 import { Configuration } from "./Configuration"
@@ -14,8 +15,6 @@ import { LanguageManager } from "./Language"
 
 import { NeovimInstance } from "./../neovim"
 
-import * as Log from "./../Log"
-
 export interface IAutoClosingPair {
     open: string
     close: string

browser/src/Services/AutoClosingPairs.ts

@@ -7,6 +7,7 @@
 import { remote } from "electron"
 
 import * as OniApi from "oni-api"
+import * as Log from "oni-core-logging"
 
 import * as App from "./../App"
 import * as Utility from "./../Utility"
@@ -15,8 +16,6 @@ import { getUserConfigFilePath } from "./Configuration"
 import { editorManager } from "./EditorManager"
 import { inputManager } from "./InputManager"
 
-import * as Log from "./../Log"
-
 import { IKey, parseKeysFromVimString } from "./../Input/KeyParser"
 
 export interface ITestResult {

browser/src/Services/Automation.ts

@@ -7,8 +7,8 @@
 import * as values from "lodash/values"
 
 import * as Oni from "oni-api"
+import * as Log from "oni-core-logging"
 
-import * as Log from "./../Log"
 import { INeovimInstance } from "./../neovim"
 import { ITask, ITaskProvider } from "./Tasks"
 

browser/src/Services/CommandManager.ts

@@ -6,7 +6,7 @@
 
 import * as types from "vscode-languageserver-types"
 
-import * as Log from "./../../Log"
+import * as Log from "oni-core-logging"
 import * as Helpers from "./../../Plugins/Api/LanguageClient/LanguageClientHelpers"
 
 import { LanguageManager } from "./../Language"

browser/src/Services/Completion/CompletionsRequestor.ts

@@ -4,9 +4,9 @@
 
 import { merge } from "lodash"
 import * as Oni from "oni-api"
+import * as Log from "oni-core-logging"
 import { Event, IDisposable, IEvent } from "oni-types"
 import { applyDefaultKeyBindings } from "./../../Input/KeyBindings"
-import * as Log from "./../../Log"
 import * as Performance from "./../../Performance"
 import { diff } from "./../../Utility"
 

browser/src/Services/Configuration/Configuration.ts

@@ -9,7 +9,7 @@ import * as path from "path"
 
 import * as mkdirp from "mkdirp"
 
-import * as Log from "./../../Log"
+import * as Log from "oni-core-logging"
 
 import { EditorManager } from "./../EditorManager"
 

browser/src/Services/Configuration/ConfigurationEditor.ts

@@ -6,7 +6,7 @@
  * deprecation policy in place - like we'll support deprecated configurations for x releases.
  */
 
-import * as Log from "./../../Log"
+import * as Log from "oni-core-logging"
 
 export interface IDeprecatedConfigurationInfo {
     replacementConfigurationName: string

browser/src/Services/Configuration/DeprecatedConfigurationValues.ts

@@ -13,10 +13,9 @@ import "rxjs/add/operator/debounceTime"
 import { Subject } from "rxjs/Subject"
 
 import * as Oni from "oni-api"
+import * as Log from "oni-core-logging"
 import { Event, IEvent } from "oni-types"
 
-import * as Log from "./../../Log"
-
 import { IConfigurationProvider } from "./Configuration"
 import { IConfigurationValues } from "./IConfigurationValues"
 

browser/src/Services/Configuration/FileConfigurationProvider.ts

@@ -6,9 +6,9 @@
 
 import * as path from "path"
 
-import * as Platform from "./../../Platform"
+import * as Log from "oni-core-logging"
 
-import * as Log from "./../../Log"
+import * as Platform from "./../../Platform"
 
 export const getUserConfigFilePath = (): string => {
     const configFileFromEnv = process.env["ONI_CONFIG_FILE"] as string // tslint:disable-line

browser/src/Services/Configuration/UserConfiguration.ts

@@ -16,7 +16,8 @@ import { forkJoin } from "rxjs/observable/forkJoin"
 import { fromPromise } from "rxjs/observable/fromPromise"
 import { timer } from "rxjs/observable/timer"
 
-import * as Log from "./../../Log"
+import * as Log from "oni-core-logging"
+
 import { createStore as createReduxStore } from "./../../Redux"
 import { configuration } from "./../Configuration"
 import { EmptyNode, ExplorerNode } from "./ExplorerSelectors"
@@ -801,7 +802,9 @@ const persistOrDeleteNode = async (
 
 export const undoEpic: ExplorerEpic = (action$, store, { fileSystem }) =>
     action$.ofType("UNDO").mergeMap(action => {
-        const { register: { undo } } = store.getState()
+        const {
+            register: { undo },
+        } = store.getState()
         const lastAction = last(undo)
 
         switch (lastAction.type) {
@@ -919,7 +922,11 @@ const expandDirectoryEpic: ExplorerEpic = (action$, store, { fileSystem }) =>
 
 export const createNodeEpic: ExplorerEpic = (action$, store, { fileSystem }) =>
     action$.ofType("CREATE_NODE_COMMIT").mergeMap(({ name }: ICreateNodeCommitAction) => {
-        const { register: { create: { nodeType } } } = store.getState()
+        const {
+            register: {
+                create: { nodeType },
+            },
+        } = store.getState()
         const shouldExpand = Actions.expandDirectory(path.dirname(name))
         const createFileOrFolder =
             nodeType === "file" ? fileSystem.writeFile(name) : fileSystem.mkdir(name)