phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr-753'

Browse Source
This commit is contained in:
Juan Martín Sotuyo Dodero
2017-11-24 23:35:47 -03:00
parent 2a1b7addb4 2d0f6ffc89
commit e3a6ee76d4
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/_includes/links.html
View File

@ -4,10 +4,12 @@
{% for entry in site.data.sidebars[sidebar].entries %}
{% for folder in entry.folders %}
{% for folderitem in folder.folderitems %}
{% if folderitem.url %}
{% if folderitem.url contains "html#" %}
[{{folderitem.url | remove: "/" }}]: {{folderitem.url | remove: "/"}}
[{{ folderitem.url | remove: "/" }}]: PageAnchorLink {{folderitem.url | remove: "/"}}
{% else %}
[{{folderitem.url | remove: "/" | remove: ".html"}}]: {{folderitem.url | remove: "/"}}
[{{ folderitem.url | remove: "/" | remove: ".html" }}]: {{ folderitem.url | remove: "/" }}
{% endif %}
{% endif %}
{% for subfolders in folderitem.subfolders %}
{% for subfolderitem in subfolders.subfolderitems %}

4
pmd-doc/src/main/java/net/sourceforge/pmd/docs/RuleDocGenerator.java
View File

@ -262,8 +262,8 @@ public class RuleDocGenerator {
.replace("${language.tersename}", languageTersename)
.replace("${ruleset.name}", RuleSetUtils.getRuleSetFilename(ref.getRuleSetReference().getRuleSetFileName()));
rules.append("[").append(ref.getRule().getName()).append("](");
rules.append(otherLink).append("#").append(ref.getName().toLowerCase(Locale.ROOT)).append(")");
rules.append("[").append(ref.getName()).append("](");
rules.append(otherLink).append("#").append(ref.getRule().getName().toLowerCase(Locale.ROOT)).append(")");
} else {
rules.append(rule.getName());
}

2
pmd-doc/src/test/resources/expected/java.md
View File

@ -29,5 +29,5 @@ folder: pmd/rules
It contains the following rules:
[JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer), [OverrideBothEqualsAndHashcode](pmd_rules_java_sample.html#overridebothequalsandhashcode)
[JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer), [OldNameOfJumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer), [OverrideBothEqualsAndHashcode](pmd_rules_java_sample.html#overridebothequalsandhashcode)

3
pmd-doc/src/test/resources/rulesets/ruledoctest/sample-deprecated.xml
View File

@ -11,4 +11,7 @@ Sample ruleset which only contains deprecated rule references.
<rule ref="rulesets/ruledoctest/sample.xml/OverrideBothEqualsAndHashcode" deprecated="true" />
<rule ref="rulesets/ruledoctest/sample.xml/JumbledIncrementer" deprecated="true" />
<!-- both moved and renamed: -->
<rule ref="rulesets/ruledoctest/sample.xml/JumbledIncrementer" name="OldNameOfJumbledIncrementer" deprecated="true" />
</ruleset>