[geany/geany] 440a73: C++, C#: Properly set scope on namespaces

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sun, 17 Jan 2016 02:30:06 UTC
Commit:      440a736018709e88f14e886f14766edbe5444b61
             https://github.com/geany/geany/commit/440a736018709e88f14e886f14766edbe5444b61

Log Message:
-----------
C++, C#: Properly set scope on namespaces

Closes #871.


Modified Paths:
--------------
    tagmanager/ctags/c.c
    tests/ctags/bug1799343-2.cpp.tags
    tests/ctags/bug665086.cpp.tags
    tests/ctags/general.cs.tags
    tests/ctags/keyword_namespace.cs.tags
    tests/ctags/namespace.cpp.tags

Modified: tagmanager/ctags/c.c
3 lines changed, 0 insertions(+), 3 deletions(-)
===================================================================
@@ -1196,9 +1196,6 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type,
 		default: break;
 
 		case TAG_NAMESPACE:
-			/* D nested template block */
-			if (!isLanguage(Lang_d))
-				break;
 		case TAG_CLASS:
 		case TAG_ENUM:
 		case TAG_ENUMERATOR:


Modified: tests/ctags/bug1799343-2.cpp.tags
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
 # format=tagmanager
 A�256�0
 B�256�0
-C�256�0
+C�256�A�0
 P�1�0
 P�1�A�0
 Q�1�A�0


Modified: tests/ctags/bug665086.cpp.tags
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
 # format=tagmanager
 C12�1�N1::N2�0
 N1�256�0
-N2�256�0
+N2�256�N1�0


Modified: tests/ctags/general.cs.tags
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -9,7 +9,7 @@ MyClass2
 MyDelegate�128�()�MyNamespace1�0�delegate int
 MyEnum�2�MyNamespace1�0
 MyNamespace1�256�0
-MyNamespace2�256�0
+MyNamespace2�256�MyNamespace1�0
 MyStruct�2048�MyNamespace1�0
 N1�256�0
-N2�256�0
+N2�256�N1�0


Modified: tests/ctags/keyword_namespace.cs.tags
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,7 +2,7 @@
 AlternativeNestedNameSpaceClass�1�SomeNameSpace.Nested�0
 Main�128�()�SomeNameSpace.MyClass�0�public void
 MyClass�1�SomeNameSpace�0
-Nested�256�0
+Nested�256�SomeNameSpace�0
 NestedNameSpaceClass�1�SomeNameSpace.Nested�0
 SayHello�128�()�SomeNameSpace.Nested.NestedNameSpaceClass�0�public void
 SomeNameSpace�256�0


Modified: tests/ctags/namespace.cpp.tags
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -4,4 +4,4 @@ a_b_f
 a_f�16�()�a�0�void
 anon_f�16�()�anon_namespace_0�0�void
 anon_namespace_0�256�0
-b�256�0
+b�256�a�0



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).