From 809388d8366c845e921a5b679c8d3e90d545acc9 Mon Sep 17 00:00:00 2001
From: Jakob Lykke Andersen <Jakob@caput.dk>
Date: Tue, 12 Dec 2017 15:03:41 +0100
Subject: [PATCH] C++, do not add index entries for decls in concepts

---
 CHANGES               |  3 ++-
 sphinx/domains/cpp.py | 24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index caa8b1324..77df660ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -86,7 +86,8 @@ Bugs fixed
 * #3882: Update the order of files for HTMLHelp and QTHelp
 * #3962: sphinx-apidoc does not recognize implicit namespace packages correctly
 * #4094: C++, allow empty template argument lists.
-* C++: also hyperlink types in the name of declarations with qualified names.
+* C++, also hyperlink types in the name of declarations with qualified names.
+* C++, do not add index entries for declarations inside concepts. 
 
 Testing
 --------
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 378c24da1..c77c38413 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -5474,13 +5474,25 @@ class CPPObject(ObjectDescription):
                       'report as bug (id=%s).' % (text_type(ast), newestId))
 
         name = text_type(ast.symbol.get_full_nested_name()).lstrip(':')
-        strippedName = name
-        for prefix in self.env.config.cpp_index_common_prefix:
-            if name.startswith(prefix):
-                strippedName = strippedName[len(prefix):]
+        # Add index entry, but not if it's a declaration inside a concept
+        isInConcept = False
+        s = ast.symbol.parent
+        while s is not None:
+            decl = s.declaration
+            s = s.parent
+            if decl is None:
+                continue
+            if decl.objectType == 'concept':
+                isInConcept = True
                 break
-        indexText = self.get_index_text(strippedName)
-        self.indexnode['entries'].append(('single', indexText, newestId, '', None))
+        if not isInConcept:
+            strippedName = name
+            for prefix in self.env.config.cpp_index_common_prefix:
+                if name.startswith(prefix):
+                    strippedName = strippedName[len(prefix):]
+                    break
+            indexText = self.get_index_text(strippedName)
+            self.indexnode['entries'].append(('single', indexText, newestId, '', None))
 
         if newestId not in self.state.document.ids:
             # if the name is not unique, the first one will win