Use the few built-in Universal ctags Clojure kinds...

... to avoid redundant namespace and function tags

(Still keep OpenGrok's many Clojure ctags regexes.)

Author: idodeclare

src/org/opensolaris/opengrok/analysis/Ctags.java

@@ -149,12 +149,16 @@ private void initialize() throws IOException {
                 command.add("--regex-golang=/var[[:space:]]+([a-zA-Z_][a-zA-Z0-9_]+)/\\1/v,var/");
                 command.add("--regex-golang=/type[[:space:]]+([a-zA-Z_][a-zA-Z0-9_]+)/\\1/t,type/");
             }
+
             //temporarily use our defs until ctags will fix https://github.com/universal-ctags/ctags/issues/988
             command.add("--langdef=clojure"); // clojure support (patterns are from https://gist.github.com/kul/8704283)
             command.add("--langmap=clojure:+.clj");
+            if (!env.isUniversalCtags()) {
+                command.add("--regex-clojure=/\\([[:space:]]*defn[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/f,function/");
+                command.add("--regex-clojure=/\\([[:space:]]*ns[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/n,namespace/");                
+            }
             command.add("--regex-clojure=/\\([[:space:]]*create-ns[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/n,namespace/");
             command.add("--regex-clojure=/\\([[:space:]]*def[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/d,definition/");
-            command.add("--regex-clojure=/\\([[:space:]]*defn[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/f,function/");
             command.add("--regex-clojure=/\\([[:space:]]*defn-[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/p,private function/");
             command.add("--regex-clojure=/\\([[:space:]]*defmacro[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/m,macro/");
             command.add("--regex-clojure=/\\([[:space:]]*definline[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/i,inline/");
@@ -163,7 +167,6 @@ private void initialize() throws IOException {
             command.add("--regex-clojure=/\\([[:space:]]*defonce[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/c,definition (once)/");
             command.add("--regex-clojure=/\\([[:space:]]*defstruct[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/s,struct/");
             command.add("--regex-clojure=/\\([[:space:]]*intern[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/v,intern/");
-            command.add("--regex-clojure=/\\([[:space:]]*ns[[:space:]]+([-[:alnum:]*+!_:\\/.?]+)/\\1/n,namespace/");
 
             command.add("--langdef=kotlin");
             command.add("--langmap=kotlin:+.kt");

test/org/opensolaris/opengrok/analysis/clojure/sampletags

@@ -6,5 +6,4 @@
 !_TAG_PROGRAM_VERSION	0.0.0	/b13cb551/
 !_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
 koans.23-meta	grok.clj	/^(ns koans.23-meta$/;"	namespace	line:195
-koans.23-meta	grok.clj	/^(ns koans.23-meta$/;"	namespace	line:195
 giants	grok.clj	/^(def giants$/;"	definition	line:198