Skip to content

Commit 546397c

Browse files
srawlinssrawlins
authored
Remove half-implemented FileStructure system (#3719)
1 parent 1236f18 commit 546397c

22 files changed

+165
-273
lines changed

‎lib/src/generator/file_structure.dart

-123
This file was deleted.

‎lib/src/generator/templates.runtime_renderers.dart

+133-51
Original file line numberDiff line numberDiff line change
@@ -1680,6 +1680,28 @@ class _Renderer_Class extends RendererBase<Class> {
16801680
getters: _invisibleGetters['InterfaceElement']!);
16811681
},
16821682
),
1683+
'fileName': Property(
1684+
getValue: (CT_ c) => c.fileName,
1685+
renderVariable:
1686+
(CT_ c, Property<CT_> self, List<String> remainingNames) {
1687+
if (remainingNames.isEmpty) {
1688+
return self.getValue(c).toString();
1689+
}
1690+
var name = remainingNames.first;
1691+
var nextProperty =
1692+
_Renderer_String.propertyMap().getValue(name);
1693+
return nextProperty.renderVariable(
1694+
self.getValue(c) as String,
1695+
nextProperty,
1696+
[...remainingNames.skip(1)]);
1697+
},
1698+
isNullValue: (CT_ c) => false,
1699+
renderValue: (CT_ c, RendererBase<CT_> r,
1700+
List<MustachioNode> ast, StringSink sink) {
1701+
_render_String(c.fileName, ast, r.template, sink,
1702+
parent: r);
1703+
},
1704+
),
16831705
'inheritanceChain': Property(
16841706
getValue: (CT_ c) => c.inheritanceChain,
16851707
renderVariable: (CT_ c, Property<CT_> self,
@@ -3835,20 +3857,6 @@ class _Renderer_Documentable extends RendererBase<Documentable> {
38353857
parent: r);
38363858
},
38373859
),
3838-
'fileStructure': Property(
3839-
getValue: (CT_ c) => c.fileStructure,
3840-
renderVariable: (CT_ c, Property<CT_> self,
3841-
List<String> remainingNames) =>
3842-
self.renderSimpleVariable(
3843-
c, remainingNames, 'FileStructure'),
3844-
isNullValue: (CT_ c) => false,
3845-
renderValue: (CT_ c, RendererBase<CT_> r,
3846-
List<MustachioNode> ast, StringSink sink) {
3847-
renderSimple(c.fileStructure, ast, r.template, sink,
3848-
parent: r,
3849-
getters: _invisibleGetters['FileStructure']!);
3850-
},
3851-
),
38523860
'hasDocumentation': Property(
38533861
getValue: (CT_ c) => c.hasDocumentation,
38543862
renderVariable: (CT_ c, Property<CT_> self,
@@ -5215,6 +5223,28 @@ class _Renderer_ExtensionType extends RendererBase<ExtensionType> {
52155223
parent: r);
52165224
},
52175225
),
5226+
'fileName': Property(
5227+
getValue: (CT_ c) => c.fileName,
5228+
renderVariable:
5229+
(CT_ c, Property<CT_> self, List<String> remainingNames) {
5230+
if (remainingNames.isEmpty) {
5231+
return self.getValue(c).toString();
5232+
}
5233+
var name = remainingNames.first;
5234+
var nextProperty =
5235+
_Renderer_String.propertyMap().getValue(name);
5236+
return nextProperty.renderVariable(
5237+
self.getValue(c) as String,
5238+
nextProperty,
5239+
[...remainingNames.skip(1)]);
5240+
},
5241+
isNullValue: (CT_ c) => false,
5242+
renderValue: (CT_ c, RendererBase<CT_> r,
5243+
List<MustachioNode> ast, StringSink sink) {
5244+
_render_String(c.fileName, ast, r.template, sink,
5245+
parent: r);
5246+
},
5247+
),
52185248
'filePath': Property(
52195249
getValue: (CT_ c) => c.filePath,
52205250
renderVariable:
@@ -6607,6 +6637,28 @@ class _Renderer_GetterSetterCombo extends RendererBase<GetterSetterCombo> {
66076637
parent: r);
66086638
},
66096639
),
6640+
'fileName': Property(
6641+
getValue: (CT_ c) => c.fileName,
6642+
renderVariable:
6643+
(CT_ c, Property<CT_> self, List<String> remainingNames) {
6644+
if (remainingNames.isEmpty) {
6645+
return self.getValue(c).toString();
6646+
}
6647+
var name = remainingNames.first;
6648+
var nextProperty =
6649+
_Renderer_String.propertyMap().getValue(name);
6650+
return nextProperty.renderVariable(
6651+
self.getValue(c) as String,
6652+
nextProperty,
6653+
[...remainingNames.skip(1)]);
6654+
},
6655+
isNullValue: (CT_ c) => false,
6656+
renderValue: (CT_ c, RendererBase<CT_> r,
6657+
List<MustachioNode> ast, StringSink sink) {
6658+
_render_String(c.fileName, ast, r.template, sink,
6659+
parent: r);
6660+
},
6661+
),
66106662
'getter': Property(
66116663
getValue: (CT_ c) => c.getter,
66126664
renderVariable:
@@ -8338,6 +8390,28 @@ class _Renderer_Library extends RendererBase<Library> {
83388390
_render_Extension(e, ast, r.template, sink, parent: r));
83398391
},
83408392
),
8393+
'fileName': Property(
8394+
getValue: (CT_ c) => c.fileName,
8395+
renderVariable:
8396+
(CT_ c, Property<CT_> self, List<String> remainingNames) {
8397+
if (remainingNames.isEmpty) {
8398+
return self.getValue(c).toString();
8399+
}
8400+
var name = remainingNames.first;
8401+
var nextProperty =
8402+
_Renderer_String.propertyMap().getValue(name);
8403+
return nextProperty.renderVariable(
8404+
self.getValue(c) as String,
8405+
nextProperty,
8406+
[...remainingNames.skip(1)]);
8407+
},
8408+
isNullValue: (CT_ c) => false,
8409+
renderValue: (CT_ c, RendererBase<CT_> r,
8410+
List<MustachioNode> ast, StringSink sink) {
8411+
_render_String(c.fileName, ast, r.template, sink,
8412+
parent: r);
8413+
},
8414+
),
83418415
'filePath': Property(
83428416
getValue: (CT_ c) => c.filePath,
83438417
renderVariable:
@@ -8709,20 +8783,6 @@ class _Renderer_LibraryContainer extends RendererBase<LibraryContainer> {
87098783
parent: r);
87108784
},
87118785
),
8712-
'fileStructure': Property(
8713-
getValue: (CT_ c) => c.fileStructure,
8714-
renderVariable: (CT_ c, Property<CT_> self,
8715-
List<String> remainingNames) =>
8716-
self.renderSimpleVariable(
8717-
c, remainingNames, 'FileStructure'),
8718-
isNullValue: (CT_ c) => false,
8719-
renderValue: (CT_ c, RendererBase<CT_> r,
8720-
List<MustachioNode> ast, StringSink sink) {
8721-
renderSimple(c.fileStructure, ast, r.template, sink,
8722-
parent: r,
8723-
getters: _invisibleGetters['FileStructure']!);
8724-
},
8725-
),
87268786
'hasPublicLibraries': Property(
87278787
getValue: (CT_ c) => c.hasPublicLibraries,
87288788
renderVariable: (CT_ c, Property<CT_> self,
@@ -9860,6 +9920,28 @@ class _Renderer_Mixin extends RendererBase<Mixin> {
98609920
parent: r, getters: _invisibleGetters['MixinElement']!);
98619921
},
98629922
),
9923+
'fileName': Property(
9924+
getValue: (CT_ c) => c.fileName,
9925+
renderVariable:
9926+
(CT_ c, Property<CT_> self, List<String> remainingNames) {
9927+
if (remainingNames.isEmpty) {
9928+
return self.getValue(c).toString();
9929+
}
9930+
var name = remainingNames.first;
9931+
var nextProperty =
9932+
_Renderer_String.propertyMap().getValue(name);
9933+
return nextProperty.renderVariable(
9934+
self.getValue(c) as String,
9935+
nextProperty,
9936+
[...remainingNames.skip(1)]);
9937+
},
9938+
isNullValue: (CT_ c) => false,
9939+
renderValue: (CT_ c, RendererBase<CT_> r,
9940+
List<MustachioNode> ast, StringSink sink) {
9941+
_render_String(c.fileName, ast, r.template, sink,
9942+
parent: r);
9943+
},
9944+
),
98639945
'hasModifiers': Property(
98649946
getValue: (CT_ c) => c.hasModifiers,
98659947
renderVariable: (CT_ c, Property<CT_> self,
@@ -10402,20 +10484,6 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
1040210484
parent: r);
1040310485
},
1040410486
),
10405-
'fileStructure': Property(
10406-
getValue: (CT_ c) => c.fileStructure,
10407-
renderVariable: (CT_ c, Property<CT_> self,
10408-
List<String> remainingNames) =>
10409-
self.renderSimpleVariable(
10410-
c, remainingNames, 'FileStructure'),
10411-
isNullValue: (CT_ c) => false,
10412-
renderValue: (CT_ c, RendererBase<CT_> r,
10413-
List<MustachioNode> ast, StringSink sink) {
10414-
renderSimple(c.fileStructure, ast, r.template, sink,
10415-
parent: r,
10416-
getters: _invisibleGetters['FileStructure']!);
10417-
},
10418-
),
1041910487
'fullyQualifiedName': Property(
1042010488
getValue: (CT_ c) => c.fullyQualifiedName,
1042110489
renderVariable:
@@ -11575,6 +11643,28 @@ class _Renderer_Operator extends RendererBase<Operator> {
1157511643
CT_,
1157611644
() => {
1157711645
..._Renderer_Method.propertyMap<CT_>(),
11646+
'fileName': Property(
11647+
getValue: (CT_ c) => c.fileName,
11648+
renderVariable:
11649+
(CT_ c, Property<CT_> self, List<String> remainingNames) {
11650+
if (remainingNames.isEmpty) {
11651+
return self.getValue(c).toString();
11652+
}
11653+
var name = remainingNames.first;
11654+
var nextProperty =
11655+
_Renderer_String.propertyMap().getValue(name);
11656+
return nextProperty.renderVariable(
11657+
self.getValue(c) as String,
11658+
nextProperty,
11659+
[...remainingNames.skip(1)]);
11660+
},
11661+
isNullValue: (CT_ c) => false,
11662+
renderValue: (CT_ c, RendererBase<CT_> r,
11663+
List<MustachioNode> ast, StringSink sink) {
11664+
_render_String(c.fileName, ast, r.template, sink,
11665+
parent: r);
11666+
},
11667+
),
1157811668
'fullyQualifiedName': Property(
1157911669
getValue: (CT_ c) => c.fullyQualifiedName,
1158011670
renderVariable:
@@ -16210,15 +16300,6 @@ const _invisibleGetters = {
1621016300
'modificationStamp',
1621116301
'runtimeType'
1621216302
},
16213-
'FileStructure': {
16214-
'dirName',
16215-
'fileName',
16216-
'hasIndependentFile',
16217-
'hashCode',
16218-
'href',
16219-
'htmlId',
16220-
'runtimeType'
16221-
},
1622216303
'FunctionElement': {
1622316304
'augmentation',
1622416305
'augmentationTarget',
@@ -16261,6 +16342,7 @@ const _invisibleGetters = {
1626116342
'documentationComment',
1626216343
'documentationFrom',
1626316344
'enclosingElement',
16345+
'fileName',
1626416346
'getter',
1626516347
'getterSetterBothAvailable',
1626616348
'hasAccessorsWithDocs',

‎lib/src/model/category.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class Category
107107
@override
108108
String get fullyQualifiedName => name;
109109

110-
String get filePath => 'topics/${fileStructure.fileName}';
110+
String get filePath => 'topics/$name-topic.html';
111111

112112
@override
113113
String? get href => isCanonical ? '${package.baseHref}$filePath' : null;

0 commit comments

Comments
 (0)