From db781dd54f862a996392e838072f3bfa6adf8e24 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 22 Sep 2016 14:21:36 -0700 Subject: [PATCH] Disallow duplicate keys when loading package keymaps Signed-off-by: Nathan Sobo --- package.json | 2 +- src/package.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5f04e6da6..e1aae1eda 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "scandal": "^2.2.1", "scoped-property-store": "^0.17.0", "scrollbar-style": "^3.2", - "season": "^5.3", + "season": "^5.4", "semver": "^4.3.3", "service-hub": "^0.7.2", "sinon": "1.17.4", diff --git a/src/package.coffee b/src/package.coffee index dbc648c7f..3933ceac2 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -251,7 +251,7 @@ class Package if @bundledPackage and @packageManager.packagesCache[@name]? @keymaps = (["#{@packageManager.resourcePath}#{path.sep}#{keymapPath}", keymapObject] for keymapPath, keymapObject of @packageManager.packagesCache[@name].keymaps) else - @keymaps = @getKeymapPaths().map (keymapPath) -> [keymapPath, CSON.readFileSync(keymapPath) ? {}] + @keymaps = @getKeymapPaths().map (keymapPath) -> [keymapPath, CSON.readFileSync(keymapPath, allowDuplicateKeys: false) ? {}] return loadMenus: ->