Skip to content

Enhance !contents to support filtering by Suites tag using -t option #1568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JGProg wants to merge 2 commits into
base: master
Choose a base branch
from
+242 −176
Open

Enhance !contents to support filtering by Suites tag using -t option #1568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efc1e7a
lt's possible with option -t to filter content by "tag"
JGProg Jun 6, 2025
86d3662
Take about documentation, include and unit test
JGProg Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 44 additions & 35 deletions src/fitnesse/wikitext/parser/Contents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,52 @@ public Contents() {

@Override
public Maybe<Symbol> parse(Symbol current, Parser parser) {
Symbol body = parser.parseToEnd(SymbolType.Newline);
for (Symbol child: body.getChildren()) {
if (child.isType(SymbolType.Whitespace)) continue;
String option = child.getContent();
if (!option.startsWith("-")) return Symbol.nothing;
if (option.equals("-R")) {
current.putProperty(option, String.valueOf(Integer.MAX_VALUE));
}
else if (option.startsWith("-R")) {
current.putProperty("-R", option.substring(2));
}
else {
current.putProperty(option, "");
Symbol body = parser.parseToEnd(SymbolType.Newline);

for (int i = 0; i < body.getChildren().size(); i++) {
Symbol child = body.getChildren().get(i);

if (child.isType(SymbolType.Whitespace)) continue;
String option = child.getContent();
if (!option.startsWith("-")) return Symbol.nothing;
if (option.equals("-R")) {
current.putProperty(option, String.valueOf(Integer.MAX_VALUE));
} else if (option.startsWith("-R")) {
current.putProperty("-R", option.substring(2));
} else if (option.equalsIgnoreCase("-t") || option.equalsIgnoreCase("-tag")) {
if (i + 1 < body.getChildren().size()) {
Symbol tagValueSymbol = body.getChildren().get(i + 1);
if (!tagValueSymbol.isType(SymbolType.Whitespace)) {
current.putProperty("-tag", tagValueSymbol.getContent());
i++;
}
}
} else {
current.putProperty(option, "");
}
}

current.copyVariables(new String[] {
Names.HELP_TOC,
Names.HELP_INSTEAD_OF_TITLE_TOC,
Names.REGRACE_TOC,
Names.PROPERTY_TOC,
Names.FILTER_TOC,
Names.MORE_SUFFIX_TOC,
Names.PROPERTY_CHARACTERS,
Names.TEST_PAGE_COUNT_TOC},
parser.getVariableSource());

return new Maybe<>(current);
}
@Override
public String toTarget(Translator translator, Symbol symbol) {
ContentsItemBuilder itemBuilder
= new ContentsItemBuilder(symbol, 1, translator.getPage());
HtmlTag contentsDiv = new HtmlTag("div");
contentsDiv.addAttribute("class", "contents");
contentsDiv.add(HtmlUtil.makeBold("Contents:"));
contentsDiv.add(itemBuilder.buildLevel(translator.getPage()));
return contentsDiv.html();
current.copyVariables(new String[]{
Names.HELP_TOC,
Names.HELP_INSTEAD_OF_TITLE_TOC,
Names.REGRACE_TOC,
Names.PROPERTY_TOC,
Names.FILTER_TOC,
Names.MORE_SUFFIX_TOC,
Names.PROPERTY_CHARACTERS,
Names.TEST_PAGE_COUNT_TOC
}, parser.getVariableSource());

return new Maybe<>(current);
}

public String toTarget(Translator translator, Symbol symbol) {
ContentsItemBuilder itemBuilder
= new ContentsItemBuilder(symbol, 1, translator.getPage());
HtmlTag contentsDiv = new HtmlTag("div");
contentsDiv.addAttribute("class", "contents");
contentsDiv.add(HtmlUtil.makeBold("Contents:"));
contentsDiv.add(itemBuilder.buildLevel(translator.getPage()));
return contentsDiv.html();
}
}
Loading