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

[cs] CPD: Fixed CPD --ignore-usings option

Browse Source
This commit is contained in:
Maikel Steneker
2020-03-06 12:52:46 +01:00
parent 90f286a4a1
commit adb38ecbbc
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsTokenizer.java
View File

@ -75,11 +75,13 @@ public class CsTokenizer extends AntlrTokenizer {
} }
private void skipUsingDirectives(final AntlrToken currentToken, final Iterable<AntlrToken> remainingTokens) { private void skipUsingDirectives(final AntlrToken currentToken, final Iterable<AntlrToken> remainingTokens) {
final int type = currentToken.getType(); if (ignoreUsings) {
if (type == CSharpLexer.USING && isUsingDirective(remainingTokens)) { final int type = currentToken.getType();
discardingUsings = true; if (type == CSharpLexer.USING && isUsingDirective(remainingTokens)) {
} else if (type == CSharpLexer.SEMICOLON) { discardingUsings = true;
discardingUsings = false; } else if (type == CSharpLexer.SEMICOLON) {
discardingUsings = false;
}
} }
} }

8
pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java
View File

@ -116,6 +116,14 @@ public class CsTokenizerTest {
assertEquals(8, tokens.getTokens().get(14).getBeginLine()); assertEquals(8, tokens.getTokens().get(14).getBeginLine());
} }
@Test
public void testDoNotIgnoreUsingDirectives() {
tokenizer.setIgnoreUsings(false);
tokenizer.tokenize(toSourceCode("using System.Text;\n"), tokens);
assertEquals(6, tokens.size());
assertEquals("using", tokens.getTokens().get(0).toString());
}
@Test @Test
public void testIgnoreUsingDirectives() { public void testIgnoreUsingDirectives() {
tokenizer.setIgnoreUsings(true); tokenizer.setIgnoreUsings(true);