Skip to content

Commit bb59581

Browse files
committed
Remove cfg-flag
1 parent d7d2638 commit bb59581

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

doc/cabaldomain.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@
6969
7070
References field added by `.. cfg-field`.
7171
72-
.. rst::role:: cfg-flag
73-
74-
References flag added by `.. cfg-field`.
7572
7673
7774
All roles can be supplied with title as in standard sphinx references::
@@ -731,7 +728,6 @@ def generate(self, docnames=None):
731728

732729
# (title, section store, fields store)
733730
entries = [('cabal.project fields', 'cfg-section', 'cfg-field'),
734-
('cabal project flags', 'cfg-section', 'cfg-flag'),
735731
('package.cabal fields', 'pkg-section', 'pkg-field')]
736732

737733
result = []
@@ -781,7 +777,7 @@ def make_data_keys(typ, target, node):
781777
section = node.get('cabal:pkg-section')
782778
return [(section, target),
783779
(None, target)]
784-
elif typ in ('cfg-field', 'cfg-flag'):
780+
elif typ == 'cfg-field':
785781
section = node.get('cabal:cfg-section')
786782
return [(section, target), (None, target)]
787783
else:
@@ -847,9 +843,7 @@ def make_title(typ, key, meta):
847843
section, name = key
848844
return "cabal.project " + name + " field " + render_meta_title(meta)
849845

850-
elif typ == 'cfg-flag':
851-
section, name = key
852-
return "cabal flag " + name + " " + render_meta_title(meta)
846+
853847

854848
else:
855849
raise ValueError("Unknown type: " + typ)
@@ -902,7 +896,6 @@ class CabalDomain(Domain):
902896
'pkg-field' : CabalPackageFieldXRef(warn_dangling=True),
903897
'cfg-section': XRefRole(warn_dangling=True),
904898
'cfg-field' : CabalConfigFieldXRef(warn_dangling=True),
905-
'cfg-flag' : CabalConfigFieldXRef(warn_dangling=True),
906899
}
907900
initial_data = {
908901
'pkg-sections': {},
@@ -911,7 +904,6 @@ class CabalDomain(Domain):
911904
'index-num' : {}, #per document number of objects
912905
# used to order references page
913906
'cfg-fields' : {},
914-
'cfg-flags' : {},
915907
}
916908
indices = [
917909
ConfigFieldIndex
@@ -921,11 +913,10 @@ class CabalDomain(Domain):
921913
'pkg-field' : 'pkg-fields',
922914
'cfg-section': 'cfg-sections',
923915
'cfg-field' : 'cfg-fields',
924-
'cfg-flag' : 'cfg-flags',
925916
}
926917
def clear_doc(self, docname):
927918
for k in ['pkg-sections', 'pkg-fields', 'cfg-sections',
928-
'cfg-fields', 'cfg-flags']:
919+
'cfg-fields']:
929920
to_del = []
930921
for name, (fn, _, _) in self.data[k].items():
931922
if fn == docname:
@@ -955,7 +946,7 @@ def get_objects(self):
955946
Used for search functionality
956947
'''
957948
for typ in ['pkg-section', 'pkg-field',
958-
'cfg-section', 'cfg-field', 'cfg-flag']:
949+
'cfg-section', 'cfg-field']:
959950
key = self.types[typ]
960951
for name, (fn, target, meta) in self.data[key].items():
961952
title = make_title(typ, name, meta)

0 commit comments

Comments
 (0)