Now underscore-plus and underscore is not required on startup

Author: t9md

lib/base.coffee

@@ -1,4 +1,8 @@
-_ = require 'underscore-plus'
+# To avoid loading underscore-plus and depending underscore on startup
+__plus = null
+_plus = ->
+  __plus ?= require 'underscore-plus'
+
 Delegato = require 'delegato'
 settings = require './settings'
 
@@ -20,7 +24,7 @@ loadVmpOperationFile = (filename) ->
   VMP_LOADED_FILES.push(filename)
   loaded
 
-{OperationAbortedError} = require './errors'
+OperationAbortedError = null
 
 vimStateMethods = [
   "onDidChangeSearch"
@@ -64,7 +68,7 @@ class Base
   constructor: (@vimState, properties=null) ->
     {@editor, @editorElement, @globalState, @swrap} = @vimState
     @name = @constructor.name
-    _.extend(this, properties) if properties?
+    Object.assign(this, properties) if properties?
 
   # To override
   initialize: ->
@@ -92,6 +96,7 @@ class Base
     @operator? and not @operator.instanceof('Select')
 
   abort: ->
+    OperationAbortedError ?= require './errors'
     throw new OperationAbortedError('aborted')
 
   # Count
@@ -250,6 +255,7 @@ class Base
   # -------------------------
   @writeCommandTableOnDisk: ->
     commandTable = @generateCommandTableByEagerLoad()
+    _ = _plus()
     if _.isEqual(@commandTable, commandTable)
       atom.notifications.addInfo("No change commandTable", dismissable: true)
       return
@@ -272,7 +278,7 @@ class Base
       './motion', './motion-search', './text-object', './misc-command'
     ]
     filesToLoad.forEach(loadVmpOperationFile)
-
+    _ = _plus()
     klasses = _.values(@getClassRegistry())
     klassesGroupedByFile = _.groupBy(klasses, (klass) -> klass.VMP_LOADING_FILE)
 
@@ -326,10 +332,10 @@ class Base
 
   @commandPrefix: 'vim-mode-plus'
   @getCommandName: ->
-    @commandPrefix + ':' + _.dasherize(@name)
+    @commandPrefix + ':' + _plus().dasherize(@name)
 
   @getCommandNameWithoutPrefix: ->
-    _.dasherize(@name)
+    _plus().dasherize(@name)
 
   @commandScope: 'atom-text-editor'
   @getCommandScope: ->
@@ -352,7 +358,7 @@ class Base
   @registerCommandFromSpec: (name, spec) ->
     {commandScope, commandPrefix, commandName, getClass} = spec
     commandScope ?= 'atom-text-editor'
-    commandName ?= (commandPrefix ? 'vim-mode-plus') + ':' + _.dasherize(name)
+    commandName ?= (commandPrefix ? 'vim-mode-plus') + ':' + _plus().dasherize(name)
     atom.commands.add commandScope, commandName, (event) ->
       vimState = getEditorState(@getModel()) ? getEditorState(atom.workspace.getActiveTextEditor())
       if vimState? # Possibly undefined See #85
@@ -365,6 +371,7 @@ class Base
   # For demo-mode pkg integration
   @operationKind: null
   @getKindForCommandName: (command) ->
+    _ = _plus()
     name = _.capitalize(_.camelize(command))
     if name of classRegistry
       classRegistry[name].operationKind

lib/errors.coffee

@@ -1,9 +1,4 @@
-class VimModePlusError extends Error
+module.exports =
+class OperationAbortedError extends Error
   constructor: ({@message}) ->
     @name = @constructor.name
-
-class OperationAbortedError extends VimModePlusError
-
-module.exports = {
-  OperationAbortedError
-}

lib/main.coffee

@@ -1,5 +1,3 @@
-_ = require 'underscore-plus'
-
 {Disposable, Emitter, CompositeDisposable} = require 'atom'
 
 Base = require './base'
@@ -78,23 +76,8 @@ module.exports =
         globalState.set('highlightSearchPattern', null)
 
     @subscribe(settings.observeConditionalKeymaps()...)
-    # @reportRequireCache(excludeNodModules: true)
-
-  reportRequireCache: ({focus, excludeNodModules}) ->
-    {inspect} = require 'util'
-    path = require 'path'
-    packPath = atom.packages.getLoadedPackage("vim-mode-plus").path
-    cachedPaths = Object.keys(require.cache)
-      .filter (p) -> p.startsWith(packPath + path.sep)
-      .map (p) -> p.replace(packPath, '')
-
-    for cachedPath in cachedPaths
-      if excludeNodModules and cachedPath.search(/node_modules/) >= 0
-        continue
-      if focus and cachedPath.search(///#{focus}///) >= 0
-        cachedPath = '*' + cachedPath
-
-      console.log cachedPath
+    # developer?.reportRequireCache(excludeNodModules: true)
+    developer?.reportRequireCache(excludeNodModules: false)
 
   observeVimMode: (fn) ->
     fn() if atom.packages.isPackageActive('vim-mode')

lib/mode-manager.coffee

@@ -1,4 +1,3 @@
-_ = require 'underscore-plus'
 {Emitter, Range, CompositeDisposable, Disposable} = require 'atom'
 moveCursorLeft = null
 

lib/operation-stack.coffee

@@ -1,7 +1,7 @@
 {Disposable, CompositeDisposable} = require 'atom'
 Base = require './base'
-{OperationAbortedError} = require './errors'
-[Select, MoveToRelativeLine] = []
+
+[OperationAbortedError, Select, MoveToRelativeLine] = []
 
 # opration life in operationStack
 # 1. run
@@ -125,6 +125,7 @@ class OperationStack
 
   handleError: (error) ->
     @vimState.reset()
+    OperationAbortedError ?= require './errors'
     unless error instanceof OperationAbortedError
       throw error
 

lib/settings.coffee

@@ -10,7 +10,6 @@ inferType = (value) ->
 class Settings
   deprecatedParams: [
     'showCursorInVisualMode'
-    'showCursorInVisualMode2'
   ]
   notifyDeprecatedParams: ->
     deprecatedParams = @deprecatedParams.filter((param) => @has(param))

lib/status-bar-manager.coffee

@@ -1,4 +1,3 @@
-_ = require 'underscore-plus'
 settings = require './settings'
 
 createDiv = ({id, classList}) ->
@@ -7,6 +6,15 @@ createDiv = ({id, classList}) ->
   div.classList.add(classList...) if classList?
   div
 
+LongModeStringTable =
+  'normal': "Normal"
+  'operator-pending': "Operator Pending"
+  'visual.characterwise': "Visual Characterwise"
+  'visual.blockwise': "Visual Blockwise"
+  'visual.linewise': "Visual Linewise"
+  'insert': "Insert"
+  'insert.replace': "Insert Replace"
+
 module.exports =
 class StatusBarManager
   prefix: 'status-bar-vim-mode-plus'
@@ -22,17 +30,9 @@ class StatusBarManager
     @element.textContent =
       switch settings.get('statusBarModeStringStyle')
         when 'short'
-          @getShortModeString(mode, submode)
+          (mode[0] + (if submode? then submode[0] else '')).toUpperCase()
         when 'long'
-          @getLongModeString(mode, submode)
-
-  getShortModeString: (mode, submode) ->
-    (mode[0] + (if submode? then submode[0] else '')).toUpperCase()
-
-  getLongModeString: (mode, submode) ->
-    modeString = _.humanizeEventName(mode)
-    modeString += " " + _.humanizeEventName(submode) if submode?
-    modeString
+          LongModeStringTable[mode + (if submode? then '.' + submode else '')]
 
   attach: ->
     @tile = @statusBar.addRightTile(item: @container, priority: 20)

lib/utils.coffee

@@ -1016,4 +1016,3 @@ module.exports = {
   rangeContainsPointWithEndExclusive
   traverseTextFromPoint
 }
-console.log "loaded", __filename