From 74c0836be50eb0cf009a858c22f03cb52a65d968 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 9 Oct 2015 17:34:22 -0700 Subject: [PATCH] :fire: Duplicate devMode/inDevMode parameter to Package, PackageManager --- spec/package-spec.coffee | 2 +- src/atom-environment.coffee | 2 +- src/package-manager.coffee | 12 +++++++++--- src/package.coffee | 10 ++++++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/spec/package-spec.coffee b/spec/package-spec.coffee index 248190af3..63a80a7db 100644 --- a/spec/package-spec.coffee +++ b/spec/package-spec.coffee @@ -10,7 +10,7 @@ describe "Package", -> keymapManager: atom.keymaps, commandRegistry: atom.command, grammarRegistry: atom.grammars, themeManager: atom.themes, menuManager: atom.menu, contextMenuManager: atom.contextMenu, - inDevMode: false + devMode: false ) buildPackage = (packagePath) -> build(Package, packagePath) diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee index 0bf2a5f12..8d50cda6b 100644 --- a/src/atom-environment.coffee +++ b/src/atom-environment.coffee @@ -147,7 +147,7 @@ class AtomEnvironment extends Model @packages = new PackageManager({ devMode, configDirPath, resourcePath, safeMode, @config, styleManager: @styles, commandRegistry: @commands, keymapManager: @keymaps, notificationManager: @notifications, - grammarRegistry: @grammars, inDevMode: @inDevMode() + grammarRegistry: @grammars }) ThemeManager = require './theme-manager' diff --git a/src/package-manager.coffee b/src/package-manager.coffee index b4af8ecdb..aeabf62a3 100644 --- a/src/package-manager.coffee +++ b/src/package-manager.coffee @@ -28,7 +28,12 @@ ThemePackage = require './theme-package' # settings and also by calling `enablePackage()/disablePackage()`. module.exports = class PackageManager - constructor: ({configDirPath, @devMode, safeMode, @resourcePath, @config, @styleManager, @notificationManager, @inDevMode, @keymapManager, @commandRegistry, @grammarRegistry}) -> + constructor: (params) -> + { + configDirPath, @devMode, safeMode, @resourcePath, @config, @styleManager, + @notificationManager, @keymapManager, @commandRegistry, @grammarRegistry + } = params + @emitter = new Emitter @activationHookEmitter = new Emitter @packageDirPaths = [] @@ -365,8 +370,9 @@ class PackageManager return null options = { - path: packagePath, metadata, packageManager: this, - @config, @styleManager, @commandRegistry, @keymapManager, @inDevMode, @notificationManager, @grammarRegistry, @themeManager, @menuManager, @contextMenuManager + path: packagePath, metadata, packageManager: this, @config, @styleManager, + @commandRegistry, @keymapManager, @devMode, @notificationManager, + @grammarRegistry, @themeManager, @menuManager, @contextMenuManager } if metadata.theme pack = new ThemePackage(options) diff --git a/src/package.coffee b/src/package.coffee index d1d63ef2f..00963ef28 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -29,7 +29,13 @@ class Package Section: Construction ### - constructor: ({@path, @metadata, @packageManager, @config, @styleManager, @commandRegistry, @keymapManager, @inDevMode, @notificationManager, @grammarRegistry, @themeManager, @menuManager, @contextMenuManager}) -> + constructor: (params) -> + { + @path, @metadata, @packageManager, @config, @styleManager, @commandRegistry, + @keymapManager, @devMode, @notificationManager, @grammarRegistry, @themeManager, + @menuManager, @contextMenuManager + } = params + @emitter = new Emitter @metadata ?= @packageManager.loadPackageMetadata(@path) @bundledPackage = @packageManager.isBundledPackagePath(@path) @@ -587,7 +593,7 @@ class Package # This information is cached in local storage on a per package/version basis # to minimize the impact on startup time. getIncompatibleNativeModules: -> - unless @inDevMode + unless @devMode try if arrayAsString = global.localStorage.getItem(@getIncompatibleNativeModulesStorageKey()) return JSON.parse(arrayAsString)