[gobject-introspection/gnome-3-38] Revert "giscanner: Fix section matching for documentation"
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/gnome-3-38] Revert "giscanner: Fix section matching for documentation"
- Date: Fri, 2 Oct 2020 19:54:43 +0000 (UTC)
commit 346c0690fe62f614ecb1f55857ea72939d9c0f83
Author: Mathieu Duponchelle <mathieu centricular com>
Date: Tue Sep 29 23:21:18 2020 +0200
Revert "giscanner: Fix section matching for documentation"
This reverts commit de6512b31b614567bf1800406303d1ccfb6d9455.
This was causing naming conflicts when the SECTION documentation
was picked over the class documentation.
See https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/360
giscanner/annotationparser.py | 7 +----
.../annotationparser/gi/identifier_section.xml | 34 ----------------------
2 files changed, 1 insertion(+), 40 deletions(-)
---
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index c9ff5c2b8..f8257206f 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -1357,12 +1357,7 @@ class GtkDocCommentBlockParser(object):
result = SECTION_RE.match(line)
if result:
- # Some projects use kebab-case or CamelCase for section
- # names. Convert them all to flat case so we can match
- # them easily later on.
- identifier_name = 'SECTION:%s' % (result.group('section_name')
- .replace("-", "")
- .lower(), )
+ identifier_name = 'SECTION:%s' % (result.group('section_name'), )
identifier_delimiter = None
identifier_fields = None
identifier_fields_start = None
diff --git a/tests/scanner/annotationparser/gi/identifier_section.xml
b/tests/scanner/annotationparser/gi/identifier_section.xml
index 380ab87bc..fad2b2edb 100644
--- a/tests/scanner/annotationparser/gi/identifier_section.xml
+++ b/tests/scanner/annotationparser/gi/identifier_section.xml
@@ -329,38 +329,4 @@ returns nothing.</description>
*/</output>
</test>
-
-<test>
- <!--
- Section name in different case styles
- See https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/350
- -->
- <input>/**
- * SECTION:Meep-App
- * @short_description: module for gtk-doc unit test
- *
- * This file contains non-sense code for the sole purpose of testing the docs.
- */</input>
- <parser>
- <docblock>
- <identifier>
- <name>SECTION:meepapp</name>
- </identifier>
- <parameters>
- <parameter>
- <name>short_description</name>
- <description>module for gtk-doc unit test</description>
- </parameter>
- </parameters>
- <description>This file contains non-sense code for the sole purpose of testing the docs.</description>
- </docblock>
- </parser>
- <output>/**
- * SECTION:meepapp
- * @short_description: module for gtk-doc unit test
- *
- * This file contains non-sense code for the sole purpose of testing the docs.
- */</output>
-</test>
-
</tests>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]