From 14e3562330573e1d387ba2ff661c40dc8f2937d1 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Mon, 29 Jan 2024 21:54:18 -0800 Subject: [PATCH 1/2] Fix failing spec --- spec/wasm-tree-sitter-language-mode-spec.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/wasm-tree-sitter-language-mode-spec.js b/spec/wasm-tree-sitter-language-mode-spec.js index 9e97324d2..b15e2245f 100644 --- a/spec/wasm-tree-sitter-language-mode-spec.js +++ b/spec/wasm-tree-sitter-language-mode-spec.js @@ -1696,6 +1696,10 @@ describe('WASMTreeSitterLanguageMode', () => { describe('.suggestedIndentForBufferRows', () => { it('works correctly when straddling an injection boundary', async () => { + + atom.config.set('language-javascript.indentation.indentBraces', true); + atom.config.set('language-javascript.indentation.indentBrackets', true); + atom.config.set('language-javascript.indentation.indentParentheses', true); const jsGrammar = new WASMTreeSitterGrammar(atom.grammars, jsGrammarPath, jsConfig); jsGrammar.addInjectionPoint(HTML_TEMPLATE_LITERAL_INJECTION_POINT); From 11ebeeab6189bfd722e855bebbeaac8348dc4aeb Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Mon, 29 Jan 2024 22:00:58 -0800 Subject: [PATCH 2/2] Prefer a more graceful solution --- spec/wasm-tree-sitter-language-mode-spec.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/wasm-tree-sitter-language-mode-spec.js b/spec/wasm-tree-sitter-language-mode-spec.js index b15e2245f..4a9ddf061 100644 --- a/spec/wasm-tree-sitter-language-mode-spec.js +++ b/spec/wasm-tree-sitter-language-mode-spec.js @@ -1695,11 +1695,12 @@ describe('WASMTreeSitterLanguageMode', () => { }); describe('.suggestedIndentForBufferRows', () => { + beforeEach(async () => { + await atom.packages.activatePackage('language-javascript'); + }) + it('works correctly when straddling an injection boundary', async () => { - atom.config.set('language-javascript.indentation.indentBraces', true); - atom.config.set('language-javascript.indentation.indentBrackets', true); - atom.config.set('language-javascript.indentation.indentParentheses', true); const jsGrammar = new WASMTreeSitterGrammar(atom.grammars, jsGrammarPath, jsConfig); jsGrammar.addInjectionPoint(HTML_TEMPLATE_LITERAL_INJECTION_POINT);