From 80787ef1e20c1dbadd76fe45e90050e40966c0d8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 8 Apr 2015 09:29:04 -0700 Subject: [PATCH] Remove try/catch around package.json requiring No other requires are ever guarded against and the package.json should be assumed to be valid JSON. --- src/context-menu-manager.coffee | 6 +----- src/keymap-extensions.coffee | 5 +---- src/menu-manager.coffee | 5 +---- src/package.coffee | 5 +---- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/context-menu-manager.coffee b/src/context-menu-manager.coffee index 7446c6ac0..8397da33d 100644 --- a/src/context-menu-manager.coffee +++ b/src/context-menu-manager.coffee @@ -8,11 +8,7 @@ Grim = require 'grim' MenuHelpers = require './menu-helpers' {validateSelector} = require './selector-validator' -try - platformContextMenu = require('../package.json')?._atomMenu?['context-menu'] -catch error - platformContextMenu = null - +platformContextMenu = require('../package.json')?._atomMenu?['context-menu'] SpecificityCache = {} # Extended: Provides a registry for commands that you'd like to appear in the diff --git a/src/keymap-extensions.coffee b/src/keymap-extensions.coffee index 06ff95cea..7ffd3d7ef 100644 --- a/src/keymap-extensions.coffee +++ b/src/keymap-extensions.coffee @@ -5,10 +5,7 @@ CSON = require 'season' {jQuery} = require 'space-pen' Grim = require 'grim' -try - bundledKeymaps = require('../package.json')?._atomKeymaps -catch error - bundledKeymaps = null +bundledKeymaps = require('../package.json')?._atomKeymaps KeymapManager::onDidLoadBundledKeymaps = (callback) -> @emitter.on 'did-load-bundled-keymaps', callback diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee index 6d4e4c77c..bd42dddb9 100644 --- a/src/menu-manager.coffee +++ b/src/menu-manager.coffee @@ -8,10 +8,7 @@ fs = require 'fs-plus' MenuHelpers = require './menu-helpers' -try - platformMenu = require('../package.json')?._atomMenu?.menu -catch error - platformMenu = null +platformMenu = require('../package.json')?._atomMenu?.menu # Extended: Provides a registry for menu items that you'd like to appear in the # application menu. diff --git a/src/package.coffee b/src/package.coffee index dd6701527..74c4f0eb8 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -11,10 +11,7 @@ Q = require 'q' ModuleCache = require './module-cache' ScopedProperties = require './scoped-properties' -try - packagesCache = require('../package.json')?._atomPackages ? {} -catch error - packagesCache = {} +packagesCache = require('../package.json')?._atomPackages ? {} # Loads and activates a package's main module and resources such as # stylesheets, keymaps, grammar, editor properties, and menus.