GitHub Issue #187 - fix ns parsing bug when :require has both :rename and :refer (#188)

Author: oakmac

lib/standard-clojure-style.js

@@ -1636,8 +1636,8 @@
     let genClassValueLineNo = -1
     let insideReaderComment = false
     let idOfLastNodeInsideReaderComment = -1
-    let requireRenameIdx = -1
-    let requireRenameParenNestingDepth = -1
+    let renameIdx = -1
+    let renameParenNestingDepth = -1
     let skipNodesUntilWeReachThisId = -1
     let sectionToAttachEolCommentsTo = null
     let nextTokenIsRequireDefaultSymbol = false
@@ -1702,7 +1702,7 @@
           insideReaderConditional = true
           currentReaderConditionalPlatform = null
           readerConditionalParenNestingDepth = parenNestingDepth
-        } else if (insideRequireForm) {
+        } else if (insideRequireForm && requireListParenNestingDepth === -1) {
           insideRequireList = true
           requireListParenNestingDepth = parenNestingDepth
         } else if (insideImportForm && parenNestingDepth > importNodeParenNestingDepth) {
@@ -1712,25 +1712,24 @@
         parenNestingDepth = dec(parenNestingDepth)
         stackPop(parenStack)
 
-        // TODO: should these be "else if"s or just "ifs" ?
-        // I think maybe they should be "if"s
+        // We can assume there is only one ns form per file and exit the main
+        // loop once we have finished parsing it.
+        if (insideNsForm && parenNestingDepth === 0) {
+          insideNsForm = false
+          nsFormEndsLineIdx = lineNo
+        }
+
         if (insideImportPackageList) {
           insideImportPackageList = false
           importPackageListFirstToken = null
-        } else if (insideRequireForm && parenNestingDepth < requireFormParenNestingDepth) {
+        }
+        if (insideRequireForm && parenNestingDepth < requireFormParenNestingDepth) {
           insideRequireForm = false
-        } else if (insideRequireList && parenNestingDepth < requireListParenNestingDepth) {
-          insideRequireList = false
-          requireListParenNestingDepth = -1
-          requireRenameIdx = -1
-        } else if (insideReferClojureForm && parenNestingDepth < referClojureParenNestingDepth) {
+          requireFormParenNestingDepth = -1
+        }
+        if (insideReferClojureForm && parenNestingDepth < referClojureParenNestingDepth) {
           insideReferClojureForm = false
           referClojureNodeIdx = -1
-        } else if (insideNsForm && parenNestingDepth === 0) {
-          // We can assume there is only one ns form per file and exit the main
-          // loop once we have finished parsing it.
-          insideNsForm = false
-          nsFormEndsLineIdx = lineNo
         }
 
         if (insideReferClojureForm && parenNestingDepth <= referClojureParenNestingDepth) {
@@ -1739,11 +1738,25 @@
           collectReferClojureRenameSymbols = false
         }
 
-        if (referIdx > 0 && parenNestingDepth < referParenNestingDepth) {
+        // we are finished collecting :refer symbols
+        if (referIdx > 0 && parenNestingDepth <= referParenNestingDepth) {
           referIdx = -1
           referParenNestingDepth = -1
+        }
+
+        // we are finished collecting :rename symbols
+        if (renameIdx > 0 && parenNestingDepth <= renameParenNestingDepth) {
+          renameIdx = -1
+          renameParenNestingDepth = -1
+        }
+
+        // we are finished collecting require prefix list symbols
+        if (insideRequireList && parenNestingDepth < requireListParenNestingDepth) {
+          insideRequireList = false
+          requireListParenNestingDepth = -1
           nextTokenIsRequireDefaultSymbol = false
         }
+
         if (insideRequireForm && requireSymbolIdx > 0) {
           requireSymbolIdx = -1
         }
@@ -1775,9 +1788,6 @@
           collectRequireExcludeSymbols = false
           requireExcludeSymbolParenDepth = -1
         }
-        if (insideRequireForm && parenNestingDepth < requireRenameParenNestingDepth) {
-          requireRenameParenNestingDepth = -1
-        }
 
         requireMacrosReferNodeIdx = -1
         requireMacrosRenameIdx = -1
@@ -2187,8 +2197,14 @@
         result.requires[activeRequireIdx].default = node.text
         nextTokenIsRequireDefaultSymbol = false
 
+      // :rename keyword inside a :require list
+      } else if (insideRequireForm && insideRequireList && renameIdx === -1 && isRenameKeyword(node)) {
+        renameIdx = idx
+        renameParenNestingDepth = parenNestingDepth
+        renamesTmp = []
+
       // collect :require renames
-      } else if (insideRequireForm && insideRequireList && requireRenameIdx > 0 && idx > requireRenameIdx && parenNestingDepth > requireRenameParenNestingDepth && isTokenNode2 && isTextNode) {
+      } else if (insideRequireForm && insideRequireList && renameIdx > 0 && idx > renameIdx && parenNestingDepth > renameParenNestingDepth && isTokenNode2 && isTextNode) {
         stackPush(renamesTmp, node.text)
 
         if (arraySize(renamesTmp) === 2) {
@@ -2259,10 +2275,9 @@
         activeRequireIdx = inc(activeRequireIdx)
         requireSymbolIdx = idx
         requireFormLineNo = lineNo
-        insidePrefixList = true
 
       // collect :require symbol inside of a list / vector
-      } else if (insideRequireForm && insideRequireList && idx > requireNodeIdx && isTokenNode2 && isTextNode && requireSymbolIdx === -1 && !isKeywordNode(node)) {
+      } else if (insideRequireForm && insideRequireList && idx > requireNodeIdx && referIdx === -1 && renameIdx === -1 && isTokenNode2 && isTextNode && requireSymbolIdx === -1 && !isKeywordNode(node)) {
         if (!isArray(result.requires)) {
           result.requires = []
         }
@@ -2316,12 +2331,6 @@
           }
         }
 
-      // :rename inside require
-      } else if (insideRequireForm && insideRequireList && idx > requireNodeIdx && isRenameKeyword(node)) {
-        requireRenameIdx = idx
-        requireRenameParenNestingDepth = parenNestingDepth
-        renamesTmp = []
-
       // collect require Strings in ClojureScript
       } else if (insideRequireForm && insideRequireList && idx > requireNodeIdx && isStringNode(node)) {
         if (!isArray(result.requires)) {

test_format/ns.eno

@@ -1949,3 +1949,39 @@
   (:require
    [clojure.string :as str]))
 --Expected
+
+# GitHub Issue #187 - :require with :refer and :rename 1
+
+> https://github.com/oakmac/standard-clojure-style-js/issues/187
+
+--Input
+(ns com.example.my-app
+  (:require
+   [foo.bar :rename {ccc ddd, aaa bbb} :refer [zzz xxx yyy]]
+   [biz.baz :refer [iii jjj] :rename {ooo ppp qqq rrr}]
+   ))
+--Input
+
+--Expected
+(ns com.example.my-app
+  (:require
+   [biz.baz :refer [iii jjj] :rename {ooo ppp, qqq rrr}]
+   [foo.bar :refer [xxx yyy zzz] :rename {aaa bbb, ccc ddd}]))
+--Expected
+
+# GitHub Issue #187 - :require with :refer and :rename 2
+
+> https://github.com/oakmac/standard-clojure-style-js/issues/187
+
+--Input
+(ns com.example.my-app
+  (:require
+    [garden.selectors :refer [&] :rename {& parent}]
+    ))
+--Input
+
+--Expected
+(ns com.example.my-app
+  (:require
+   [garden.selectors :refer [&] :rename {& parent}]))
+--Expected

test_parse_ns/parse_ns.eno

@@ -3177,3 +3177,58 @@
   ]
 }
 --Expected
+
+# GitHub Issue #187 - :require with :refer and :rename
+
+> https://github.com/oakmac/standard-clojure-style-js/issues/187
+
+--Input
+(ns com.example.my-app
+  (:require
+   [foo.bar :rename {ccc ddd, aaa bbb} :refer [zzz xxx yyy]]
+   [biz.baz :refer [iii jjj] :rename {ooo ppp qqq rrr}]
+   ))
+--Input
+
+--Expected
+{
+  "nsSymbol": "com.example.my-app",
+  "requires": [
+    {
+      "symbol": "biz.baz",
+      "refer": [
+        {"symbol": "iii"},
+        {"symbol": "jjj"}
+      ],
+      "rename": [
+        {
+          "fromSymbol": "ooo",
+          "toSymbol": "ppp"
+        },
+        {
+          "fromSymbol": "qqq",
+          "toSymbol": "rrr"
+        }
+      ]
+    },
+    {
+      "symbol": "foo.bar",
+      "refer": [
+        {"symbol": "xxx"},
+        {"symbol": "yyy"},
+        {"symbol": "zzz"}
+      ],
+      "rename": [
+        {
+          "fromSymbol": "aaa",
+          "toSymbol": "bbb"
+        },
+        {
+          "fromSymbol": "ccc",
+          "toSymbol": "ddd"
+        }
+      ]
+    }
+  ]
+}
+--Expected