Merge pull request #234 from UziTech/grammar-substring

fix: fix grammar condition when substring of editor grammar
cakecatz · Mar 25, 2021 · 5e480d7 · 5e480d7
2 parents a118f42 + 3618f34
commit 5e480d7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/flex-tool-bar.js b/lib/flex-tool-bar.js
@@ -774,7 +774,7 @@ export default {
 	grammarCondition(condition) {
 		this.conditionTypes.grammar = true;
 		return this.reversableStringCondition(condition, (c) => {
-			return this.activeItem && this.activeItem.grammar && this.activeItem.grammar.includes(c.toLowerCase());
+			return this.activeItem && this.activeItem.grammar && this.activeItem.grammar === c.toLowerCase();
 		});
 	},
 

diff --git a/spec/flex-tool-bar-spec.js b/spec/flex-tool-bar-spec.js
@@ -304,6 +304,24 @@ describe('FlexToolBar', function () {
 			expect(match).toBe(true);
 			expect(notMatch).toBe(false);
 		});
+
+		it('should not match substring', function () {
+			flexToolBar.activeItem.grammar = 'cpp';
+
+			const match = flexToolBar.checkConditions({grammar: 'c'});
+			const notMatch = flexToolBar.checkConditions({grammar: '!c'});
+			expect(match).toBe(false);
+			expect(notMatch).toBe(true);
+		});
+
+		it('should not match grammar substring', function () {
+			flexToolBar.activeItem.grammar = 'c';
+
+			const match = flexToolBar.checkConditions({grammar: 'cpp'});
+			const notMatch = flexToolBar.checkConditions({grammar: '!cpp'});
+			expect(match).toBe(false);
+			expect(notMatch).toBe(true);
+		});
 	});
 
 	describe('pattern condition', function () {