From ca854cc2679997ab3ebc2c15155996ad1eb311d1 Mon Sep 17 00:00:00 2001
From: Ashi Krishnan <queerviolet@github.com>
Date: Mon, 9 Jul 2018 17:11:13 -0400
Subject: [PATCH] Spec for injected language folding.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@github.com>
---
 spec/tree-sitter-language-mode-spec.js | 78 +++++++++++++++++++++++++-
 src/tree-sitter-language-mode.js       |  3 -
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/spec/tree-sitter-language-mode-spec.js b/spec/tree-sitter-language-mode-spec.js
index b9ad968d2..7243fe070 100644
--- a/spec/tree-sitter-language-mode-spec.js
+++ b/spec/tree-sitter-language-mode-spec.js
@@ -952,6 +952,82 @@ describe('TreeSitterLanguageMode', () => {
         `)
       })
     })
+
+    it('folds code in injected languages', async () => {
+      const htmlGrammar = new TreeSitterGrammar(atom.grammars, htmlGrammarPath, {
+        id: 'html',
+        parser: 'tree-sitter-html',
+        scopes: {},
+        folds: [{
+          type: ['element', 'raw_element'],
+          start: {index: 0},
+          end: {index: -1}
+        }],
+        injectionRegExp: 'html'
+      })
+
+      const jsGrammar = new TreeSitterGrammar(atom.grammars, jsGrammarPath, {
+        id: 'javascript',
+        parser: 'tree-sitter-javascript',
+        scopes: {},
+        folds: [{
+          type: ['template_string'],
+          start: {index: 0},
+          end: {index: -1},
+        },
+        {
+          start: {index: 0, type: '('},
+          end: {index: -1, type: ')'}
+        }],
+        injectionRegExp: 'javascript',
+        injectionPoints: [HTML_TEMPLATE_LITERAL_INJECTION_POINT]
+      })
+
+      atom.grammars.addGrammar(htmlGrammar)
+
+      buffer.setText(
+        `a = html \`
+            <div>
+              c\${def(
+                1,
+                2,
+                3,
+              )}e\${f}g
+            </div>
+          \`
+        `
+      )
+      const languageMode = new TreeSitterLanguageMode({buffer, grammar: jsGrammar, grammars: atom.grammars})
+      buffer.setLanguageMode(languageMode)
+
+      await nextHighlightingUpdate(languageMode)
+      await nextHighlightingUpdate(languageMode)
+
+      editor.foldBufferRow(2)
+      expect(getDisplayText(editor)).toBe(
+        `a = html \`
+            <div>
+              c\${def(…)}e\${f}g
+            </div>
+          \`
+        `
+      )
+
+      editor.foldBufferRow(1)
+      expect(getDisplayText(editor)).toBe(
+        `a = html \`
+            <div>…
+            </div>
+          \`
+        `
+      )
+
+      editor.foldBufferRow(0)
+      expect(getDisplayText(editor)).toBe(
+        `a = html \`…\`
+        `
+      )
+    })
   })
 
   describe('.scopeDescriptorForPosition', () => {
@@ -980,7 +1056,7 @@ describe('TreeSitterLanguageMode', () => {
     })
   })
 
-  fdescribe('TextEditor.selectLargerSyntaxNode and .selectSmallerSyntaxNode', () => {
+  describe('TextEditor.selectLargerSyntaxNode and .selectSmallerSyntaxNode', () => {
     it('expands and contracts the selection based on the syntax tree', async () => {
       const grammar = new TreeSitterGrammar(atom.grammars, jsGrammarPath, {
         parser: 'tree-sitter-javascript',
diff --git a/src/tree-sitter-language-mode.js b/src/tree-sitter-language-mode.js
index 405044a4e..57d8435f0 100644
--- a/src/tree-sitter-language-mode.js
+++ b/src/tree-sitter-language-mode.js
@@ -247,16 +247,13 @@ class TreeSitterLanguageMode {
 
     let smallestRange
     this._forEachTreeWithRange(new Range(point, point), (tree, grammar) => {
-      console.log('--- tree', tree.rootNode.type)
       let node = tree.rootNode.descendantForPosition(this.buffer.clipPosition(point))
       while (node) {
         if (existenceOnly && node.startPosition.row < point.row) return
         if (node.endPosition.row > point.row) {
           const range = this.getFoldableRangeForNode(node, grammar)
-          console.log('examining', node, range)
           if (range && rangeIsSmaller(range, smallestRange)) {
             smallestRange = range
-            console.log('  is new smallest')
             return
           }
         }