fix(package condition): Check if package is loaded not just active

fixes #158
cakecatz · Aug 5, 2019 · b248b1a · b248b1a
1 parent 009163f
commit b248b1a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/flex-tool-bar.js b/lib/flex-tool-bar.js
@@ -787,7 +787,7 @@ export default {
 
 	packageCondition(condition) {
 		this.conditionTypes.package = true;
-		return this.reversableStringCondition(condition, (c) => atom.packages.isPackageActive(c));
+		return this.reversableStringCondition(condition, (c) => (atom.packages.isPackageLoaded(c) && !atom.packages.isPackageDisabled(c)));
 	},
 
 	settingCondition(condition) {

diff --git a/spec/flex-tool-bar-spec.js b/spec/flex-tool-bar-spec.js
@@ -322,6 +322,25 @@ describe('FlexToolBar', function () {
 			expect(notMatch).toBe(false);
 			expect(match).toBe(true);
 		});
+
+		it('should check .package loaded', async function () {
+			await atom.packages.loadPackage('language-text');
+
+			const notMatch = flexToolBar.checkConditions({package: '!language-text'});
+			const match = flexToolBar.checkConditions({package: 'language-text'});
+			expect(notMatch).toBe(false);
+			expect(match).toBe(true);
+		});
+
+		it('should check .package disabled', async function () {
+			await atom.packages.loadPackage('language-text');
+			await atom.packages.disablePackage('language-text');
+
+			const notMatch = flexToolBar.checkConditions({package: 'language-text'});
+			const match = flexToolBar.checkConditions({package: '!language-text'});
+			expect(notMatch).toBe(false);
+			expect(match).toBe(true);
+		});
 	});
 
 	describe('function condition', function () {