Merge pull request universal-ctags#1743 from masatake/clojure-fix-nam…

…espace-handling Clojure: skip metadata in namespace definition
tony534 · Apr 23, 2018 · 2799cd3 · 2799cd3
2 parents 0890809 + 9342384
commit 2799cd3
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 0 deletions.
diff --git a/Units/parser-clojure.r/broken-ns.d/expected.tags b/Units/parser-clojure.r/broken-ns.d/expected.tags
diff --git a/Units/parser-clojure.r/broken-ns.d/input-0.clj b/Units/parser-clojure.r/broken-ns.d/input-0.clj
@@ -0,0 +1 @@
+(ns ^abc
diff --git a/Units/parser-clojure.r/broken-ns.d/input-1.clj b/Units/parser-clojure.r/broken-ns.d/input-1.clj
@@ -0,0 +1 @@
+(ns ^abc
diff --git a/Units/parser-clojure.r/broken-ns.d/input.clj b/Units/parser-clojure.r/broken-ns.d/input.clj
@@ -0,0 +1 @@
+(ns ^{:doc "Document"}
diff --git a/Units/parser-clojure.r/clojure-metadata-in-ns.d/args.ctags b/Units/parser-clojure.r/clojure-metadata-in-ns.d/args.ctags
@@ -0,0 +1 @@
+--sort=no
diff --git a/Units/parser-clojure.r/clojure-metadata-in-ns.d/expected.tags b/Units/parser-clojure.r/clojure-metadata-in-ns.d/expected.tags
@@ -0,0 +1,24 @@
+ns0	input.clj	/^(ns ^{:doc "Utility functions."} ns0)$/;"	n
+debug0?	input.clj	/^(defn debug0? ^boolean$/;"	f	namespace:ns0
+ns1	input-0.clj	/^(ns ^:dynamic ns1)$/;"	n
+debug1?	input-0.clj	/^(defn debug1? ^boolean$/;"	f	namespace:ns1
+ns2	input-0.clj	/^(ns ^String ns2)$/;"	n
+debug2?	input-0.clj	/^(defn debug2? ^boolean$/;"	f	namespace:ns2
+ns00	input-0.clj	/^(ns ^{:doc "Utility functions."} ^{:doc1 "something"} ns00)$/;"	n
+debug00?	input-0.clj	/^(defn debug00? ^boolean$/;"	f	namespace:ns00
+ns01	input-0.clj	/^(ns ^{:doc "Utility functions."} ^:dynamic ns01)$/;"	n
+debug01?	input-0.clj	/^(defn debug01? ^boolean$/;"	f	namespace:ns01
+ns02	input-0.clj	/^(ns ^{:doc "Utility functions."} ^String ns02)$/;"	n
+debug02?	input-0.clj	/^(defn debug02? ^boolean$/;"	f	namespace:ns02
+ns10	input-0.clj	/^(ns ^:dynamic ^{:doc "Utility functions."} ns10)$/;"	n
+debug10?	input-0.clj	/^(defn debug10? ^boolean$/;"	f	namespace:ns10
+ns11	input-0.clj	/^(ns ^:dynamic ^:dynamic-something ns11)$/;"	n
+debug11?	input-0.clj	/^(defn debug11? ^boolean$/;"	f	namespace:ns11
+ns12	input-0.clj	/^(ns ^:dynamic ^String ns12)$/;"	n
+debug12?	input-0.clj	/^(defn debug12? ^boolean$/;"	f	namespace:ns12
+ns20	input-0.clj	/^(ns ^String ^{:doc "Utility functions."} ns20)$/;"	n
+debug20?	input-0.clj	/^(defn debug20? ^boolean$/;"	f	namespace:ns20
+ns21	input-0.clj	/^(ns ^String ^:dynamic ns21)$/;"	n
+debug21?	input-0.clj	/^(defn debug21? ^boolean$/;"	f	namespace:ns21
+ns22	input-0.clj	/^(ns ^String ^String-something ns22)$/;"	n
+debug22?	input-0.clj	/^(defn debug22? ^boolean$/;"	f	namespace:ns22
diff --git a/Units/parser-clojure.r/clojure-metadata-in-ns.d/input-0.clj b/Units/parser-clojure.r/clojure-metadata-in-ns.d/input-0.clj
@@ -0,0 +1,55 @@
+(ns ^:dynamic ns1)
+(defn debug1? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^String ns2)
+(defn debug2? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^{:doc "Utility functions."} ^{:doc1 "something"} ns00)
+(defn debug00? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^{:doc "Utility functions."} ^:dynamic ns01)
+(defn debug01? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^{:doc "Utility functions."} ^String ns02)
+(defn debug02? ^boolean
+  []
+  goog.DEBUG)
+
+
+(ns ^:dynamic ^{:doc "Utility functions."} ns10)
+(defn debug10? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^:dynamic ^:dynamic-something ns11)
+(defn debug11? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^:dynamic ^String ns12)
+(defn debug12? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^String ^{:doc "Utility functions."} ns20)
+(defn debug20? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^String ^:dynamic ns21)
+(defn debug21? ^boolean
+  []
+  goog.DEBUG)
+
+(ns ^String ^String-something ns22)
+(defn debug22? ^boolean
+  []
+  goog.DEBUG)
diff --git a/Units/parser-clojure.r/clojure-metadata-in-ns.d/input.clj b/Units/parser-clojure.r/clojure-metadata-in-ns.d/input.clj
@@ -0,0 +1,5 @@
+;; Taken from #1657 opened by @arichiardi
+(ns ^{:doc "Utility functions."} ns0)
+(defn debug0? ^boolean
+  []
+  goog.DEBUG)
diff --git a/Units/simple-clojure.d/expected.tags → ...-clojure.r/simple-clojure.d/expected.tags b/Units/simple-clojure.d/expected.tags → ...-clojure.r/simple-clojure.d/expected.tags
diff --git a/Units/simple-clojure.d/input.clj → ...rser-clojure.r/simple-clojure.d/input.clj b/Units/simple-clojure.d/input.clj → ...rser-clojure.r/simple-clojure.d/input.clj
diff --git a/parsers/clojure.c b/parsers/clojure.c
@@ -60,8 +60,43 @@ static void functionName (vString * const name, const char *dbp)
 		vStringPut (name, *p);
 }
 
+const char* skipMetadata (const char *dbp)
+{
+	while (1)
+	{
+		if (*dbp == '^')
+		{
+			dbp++;
+			if (*dbp == '{')
+			{
+				/* skipping an arraymap */
+				for (; *dbp != '\0' && *dbp != '}'; dbp++)
+					;
+			}
+			else
+			{
+				/* skip a keyword or a symbol */
+				for (; *dbp != '\0' && !isspace((unsigned char)*dbp); dbp++)
+					;
+			}
+
+			if (*dbp == '\0')
+				break;
+
+			dbp++;
+			while (isspace ((unsigned char)*dbp))
+				dbp++;
+		}
+		else
+			break;
+	}
+
+	return dbp;
+}
+
 static int makeNamespaceTag (vString * const name, const char *dbp)
 {
+	dbp = skipMetadata (dbp);
 	functionName (name, dbp);
 	if (vStringLength (name) > 0 && ClojureKinds[K_NAMESPACE].enabled)
 	{