Skip to content

Commit 12f66d8

Browse files
committed
variable fix
1 parent 169c988 commit 12f66d8

File tree

2 files changed

+34
-29
lines changed

2 files changed

+34
-29
lines changed

codegen/core/src/main/java/software/amazon/smithy/python/codegen/generators/SetupGenerator.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.util.function.Function;
1515
import java.util.stream.Collectors;
1616
import java.util.stream.Stream;
17-
1817
import software.amazon.smithy.aws.traits.ServiceTrait;
1918
import software.amazon.smithy.codegen.core.CodegenException;
2019
import software.amazon.smithy.codegen.core.SymbolDependency;
@@ -278,10 +277,16 @@ private static void writeDocsSkeleton(
278277
writer.addDependency(SmithyPythonDependency.SPHINX);
279278
writer.addDependency(SmithyPythonDependency.SPHINX_PYDATA_THEME);
280279
});
281-
writeConf(settings, context);
280+
var service = context.model().expectShape(settings.service());
281+
String projectName = service.getTrait(TitleTrait.class)
282+
.map(StringTrait::getValue)
283+
.orElseGet(() -> service.getTrait(ServiceTrait.class)
284+
.map(ServiceTrait::getSdkId)
285+
.orElse(context.settings().service().getName()));
286+
writeConf(settings, context, projectName);
287+
writeIndexes(context, projectName);
282288
writeMakeBat(context);
283289
writeMakeFile(context);
284-
writeIndexes(context);
285290
}
286291

287292
/**
@@ -293,13 +298,10 @@ private static void writeDocsSkeleton(
293298
*/
294299
private static void writeConf(
295300
PythonSettings settings,
296-
GenerationContext context
301+
GenerationContext context,
302+
String projectName
297303
) {
298-
var service = context.model().expectShape(settings.service());
299304
String version = settings.moduleVersion();
300-
String project = service.getTrait(TitleTrait.class)
301-
.map(StringTrait::getValue)
302-
.orElse(service.getTrait(ServiceTrait.class).get().getSdkId());
303305
context.writerDelegator().useFileWriter("docs/conf.py", "", writer -> {
304306
writer.write("""
305307
import os
@@ -325,12 +327,12 @@ private static void writeConf(
325327
html_theme = 'pydata_sphinx_theme'
326328
html_theme_options = {
327329
"logo": {
328-
"text": "AWS SDK for Python",
330+
"text": "$L",
329331
}
330332
}
331333
332334
autodoc_typehints = 'both'
333-
""", project, version);
335+
""", projectName, version, projectName);
334336
});
335337
}
336338

@@ -419,20 +421,20 @@ private static void writeMakeFile(
419421
*
420422
* @param context The generation context containing the writer delegator.
421423
*/
422-
private static void writeIndexes(GenerationContext context) {
424+
private static void writeIndexes(GenerationContext context, String projectName) {
423425
// Write the main index file for the documentation
424426
context.writerDelegator().useFileWriter("docs/index.rst", "", writer -> {
425427
writer.write("""
426-
AWS SDK For Python
427-
====================================================
428+
$L
429+
$L
428430
429431
.. toctree::
430432
:maxdepth: 2
431433
:titlesonly:
432434
:glob:
433435
434436
*/index
435-
""");
437+
""", projectName, "=".repeat(projectName.length()));
436438
});
437439

438440
// Write the index file for the client section

codegen/core/src/main/java/software/amazon/smithy/python/codegen/writer/MarkdownToRstDocConverter.java

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@
44
*/
55
package software.amazon.smithy.python.codegen.writer;
66

7-
import org.jsoup.Jsoup;
8-
import org.jsoup.nodes.Document;
9-
import org.jsoup.nodes.Element;
10-
import org.jsoup.nodes.Node;
11-
import org.jsoup.nodes.TextNode;
12-
import org.jsoup.select.NodeVisitor;
13-
import software.amazon.smithy.utils.SetUtils;
14-
import software.amazon.smithy.utils.SmithyInternalApi;
7+
import static org.jsoup.nodes.Document.OutputSettings.Syntax.html;
8+
159
import org.commonmark.node.BlockQuote;
1610
import org.commonmark.node.FencedCodeBlock;
1711
import org.commonmark.node.Heading;
@@ -20,8 +14,14 @@
2014
import org.commonmark.node.ThematicBreak;
2115
import org.commonmark.parser.Parser;
2216
import org.commonmark.renderer.html.HtmlRenderer;
23-
24-
import static org.jsoup.nodes.Document.OutputSettings.Syntax.html;
17+
import org.jsoup.Jsoup;
18+
import org.jsoup.nodes.Document;
19+
import org.jsoup.nodes.Element;
20+
import org.jsoup.nodes.Node;
21+
import org.jsoup.nodes.TextNode;
22+
import org.jsoup.select.NodeVisitor;
23+
import software.amazon.smithy.utils.SetUtils;
24+
import software.amazon.smithy.utils.SmithyInternalApi;
2525

2626
/**
2727
* Add a runtime plugin to convert the HTML docs that are provided by services into RST
@@ -30,8 +30,12 @@
3030
public class MarkdownToRstDocConverter {
3131
private static final Parser MARKDOWN_PARSER = Parser.builder()
3232
.enabledBlockTypes(SetUtils.of(
33-
Heading.class, HtmlBlock.class, ThematicBreak.class, FencedCodeBlock.class,
34-
BlockQuote.class, ListBlock.class))
33+
Heading.class,
34+
HtmlBlock.class,
35+
ThematicBreak.class,
36+
FencedCodeBlock.class,
37+
BlockQuote.class,
38+
ListBlock.class))
3539
.build();
3640

3741
// Singleton instance
@@ -46,11 +50,10 @@ public static MarkdownToRstDocConverter getInstance() {
4650
return DOC_CONVERTER;
4751
}
4852

49-
5053
public String convertCommonmarkToRst(String commonmark) {
5154
String html =
5255
HtmlRenderer.builder().escapeHtml(false).build().render(MARKDOWN_PARSER.parse(commonmark));
53-
Document document = Jsoup.parse(commonmark);
56+
Document document = Jsoup.parse(html);
5457
RstNodeVisitor visitor = new RstNodeVisitor();
5558
document.body().traverse(visitor);
5659
return "\n" + visitor;
@@ -169,4 +172,4 @@ public String toString() {
169172
return sb.toString();
170173
}
171174
}
172-
}
175+
}

0 commit comments

Comments
 (0)