Skip to content

Commit ba81607

Browse files
committed
extraction mode upgrade checks file filters
#fix
1 parent a7a1719 commit ba81607

File tree

8 files changed

+4
-65
lines changed

8 files changed

+4
-65
lines changed

src/lib/AST/ASTVisitor.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,8 @@ populateInfoBases(InfoTy& I, bool const isNew, DeclTy* D)
675675
{
676676
// Try an exact match here
677677
auto qualifiedName = this->qualifiedName(D);
678-
if (checkSymbolFiltersImpl<false>(std::string_view(qualifiedName.str())))
678+
if (checkSymbolFiltersImpl<false>(std::string_view(qualifiedName.str())) &&
679+
checkFileFilters(D))
679680
{
680681
I.Extraction = ExtractionMode::Regular;
681682
// default mode also becomes regular for its

test-files/golden-tests/core/libcxx.adoc

-13
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@
55
== Global namespace
66

77

8-
=== Namespaces
9-
10-
[cols=1]
11-
|===
12-
| Name
13-
14-
| <<std,`std`>>
15-
|===
168
=== Functions
179

1810
[cols=2]
@@ -26,11 +18,6 @@
2618

2719
|===
2820

29-
[#std]
30-
== std
31-
32-
33-
3421
[#sqrt]
3522
== sqrt
3623

test-files/golden-tests/core/libcxx.html

-17
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ <h1>Reference</h1>
99
<div>
1010
<h2 id="index">Global namespace</h2>
1111
</div>
12-
<h2>Namespaces</h2>
13-
<table style="table-layout: fixed; width: 100%;">
14-
<thead>
15-
<tr>
16-
<th>Name</th>
17-
</tr>
18-
</thead>
19-
<tbody>
20-
<tr>
21-
<td><a href="#std"><code>std</code></a> </td></tr>
22-
</tbody>
23-
</table>
2412
<h2>Functions</h2>
2513
<table style="table-layout: fixed; width: 100%;">
2614
<thead>
@@ -38,11 +26,6 @@ <h2>Functions</h2>
3826
</div>
3927
<div>
4028
<div>
41-
<h2 id="std">std</h2>
42-
</div>
43-
</div>
44-
<div>
45-
<div>
4629
<h2 id="sqrt">sqrt</h2>
4730
<div>
4831
<p><span>Computes the square root of an integral value.</span></p>

test-files/golden-tests/core/libcxx.xml

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
44
<namespace id="//////////////////////////8=">
5-
<namespace name="std" id="eIvg7iueGIPcE8p1NVfngsp2ojw=">
6-
</namespace>
75
<template>
86
<tparam name="T" class="type"/>
97
<function name="sqrt" id="ulFDUE1svTCX8fV/h8EIp4NNbWs=">

test-files/golden-tests/metadata/mrdocs.yml

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
concurrency: 1
33
source-root: .
44
single-page: true
5+
input:
6+
- .

test-files/golden-tests/snippets/sqrt.adoc

-13
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@
55
== Global namespace
66

77

8-
=== Namespaces
9-
10-
[cols=1]
11-
|===
12-
| Name
13-
14-
| <<std,`std`>>
15-
|===
168
=== Functions
179

1810
[cols=2]
@@ -26,11 +18,6 @@
2618

2719
|===
2820

29-
[#std]
30-
== std
31-
32-
33-
3421
[#sqrt]
3522
== sqrt
3623

test-files/golden-tests/snippets/sqrt.html

-17
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ <h1>Reference</h1>
99
<div>
1010
<h2 id="index">Global namespace</h2>
1111
</div>
12-
<h2>Namespaces</h2>
13-
<table style="table-layout: fixed; width: 100%;">
14-
<thead>
15-
<tr>
16-
<th>Name</th>
17-
</tr>
18-
</thead>
19-
<tbody>
20-
<tr>
21-
<td><a href="#std"><code>std</code></a> </td></tr>
22-
</tbody>
23-
</table>
2412
<h2>Functions</h2>
2513
<table style="table-layout: fixed; width: 100%;">
2614
<thead>
@@ -38,11 +26,6 @@ <h2>Functions</h2>
3826
</div>
3927
<div>
4028
<div>
41-
<h2 id="std">std</h2>
42-
</div>
43-
</div>
44-
<div>
45-
<div>
4629
<h2 id="sqrt">sqrt</h2>
4730
<div>
4831
<p><span>Computes the square root of an integral value.</span></p>

test-files/golden-tests/snippets/sqrt.xml

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
44
<namespace id="//////////////////////////8=">
5-
<namespace name="std" id="eIvg7iueGIPcE8p1NVfngsp2ojw=">
6-
</namespace>
75
<template>
86
<tparam name="T" class="type"/>
97
<function name="sqrt" id="ulFDUE1svTCX8fV/h8EIp4NNbWs=">

0 commit comments

Comments
 (0)