Merge pull request #1161 from pulsar-edit/settings-view/keymap-platfo…

…rm-compatibility-check

[settings-view] Fix Package keymap compatibility check

packages/settings-view/lib/package-keymap-view.js

@@ -11,7 +11,6 @@ import KeybindingsPanel from './keybindings-panel'
 export default class PackageKeymapView {
   constructor (pack) {
     this.pack = pack
-    this.otherPlatformPattern = new RegExp(`\\.platform-(?!${_.escapeRegExp(process.platform)}\\b)`)
     this.namespace = this.pack.name
     this.disposables = new CompositeDisposable()
     etch.initialize(this)
@@ -128,8 +127,8 @@ export default class PackageKeymapView {
         continue
       }
 
-      if (this.otherPlatformPattern.test(selector)) {
-        continue
+      if (!this.selectorIsCompatibleWithPlatform(selector)) {
+        continue;
       }
 
       const keyBindingRow = document.createElement('tr')
@@ -183,4 +182,11 @@ export default class PackageKeymapView {
 
     atom.clipboard.write(content)
   }
+
+  selectorIsCompatibleWithPlatform(selector, platform = process.platform) {
+    const otherPlatformPattern = new RegExp(`\\.platform-(?!${_.escapeRegExp(platform)}\\b)`);
+    const currentPlatformPattern = new RegExp(`\\.platform-(${_.escapeRegExp(platform)}\\b)`);
+
+    return !(otherPlatformPattern.test(selector) && !currentPlatformPattern.test(selector));
+  }
 }

packages/settings-view/spec/package-keymap-view-spec.js

@@ -0,0 +1,35 @@
+
+const PackageKeymapView = require("../lib/package-keymap-view.js");
+let view;
+
+describe("PackageKeymapView", () => {
+
+  beforeEach(() => {
+    // Just prevent this stuff from calling through, it doesn't matter for this test
+    spyOn(atom.packages, "getLoadedPackage").andReturn({ keymaps: [] });
+
+    view = new PackageKeymapView({
+      name: "test-package"
+    });
+  });
+
+  it("should say a selector with no platform listed is compatible with the current one", () => {
+    expect(view.selectorIsCompatibleWithPlatform("atom-text-editor", "win32")).toBe(true);
+  });
+
+  it("should say a selector with a platform other than the current is not compatible", () => {
+    expect(view.selectorIsCompatibleWithPlatform(".platform-darwin", "linux")).toBe(false);
+    expect(view.selectorIsCompatibleWithPlatform(".platform-win32", "darwin")).toBe(false);
+  });
+
+  it("should say a selector with the current platform listed is compatible", () => {
+    expect(view.selectorIsCompatibleWithPlatform(".platform-linux", "linux")).toBe(true);
+    expect(view.selectorIsCompatibleWithPlatform(".platform-win32", "win32")).toBe(true);
+    expect(view.selectorIsCompatibleWithPlatform(".platform-darwin", "darwin")).toBe(true);
+  });
+
+  it("should say a selector with the current platform and others listed is compatible", () => {
+    expect(view.selectorIsCompatibleWithPlatform(".platform-linux, .platform-win32", "win32")).toBe(true);
+    expect(view.selectorIsCompatibleWithPlatform(".platform-linux, .platform-win32", "linux")).toBe(true);
+  });
+});