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

Merge branch 'master' into 7.0.x

Browse Source
This commit is contained in:
Clément Fournier
2020-09-13 01:41:46 +02:00
parent 57c25685b6 dacfff1abf
commit f5e4a0f81c
23 changed files with 988 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-ruby/src/main/java/net/sourceforge/pmd/cpd/RubyLanguage.java
View File

@ -15,6 +15,6 @@ public class RubyLanguage extends AbstractLanguage {
* Creates a new Ruby Language instance.
*/
public RubyLanguage() {
super("Ruby", "ruby", new RubyTokenizer(), ".rb", ".cgi", ".class");
super("Ruby", "ruby", new AnyTokenizer("#"), ".rb", ".cgi", ".class");
}
}

2
pmd-ruby/src/main/java/net/sourceforge/pmd/cpd/RubyTokenizer.java
View File

@ -10,7 +10,9 @@ import java.util.ArrayList;
* Tokenizer for Ruby.
*
* @author Zev Blut zb@ubit.com
* @deprecated Was replaced by an {@link AnyTokenizer}. Use {@link RubyLanguage#getTokenizer()} anyway
*/
@Deprecated
public class RubyTokenizer extends AbstractTokenizer {
/**

2
pmd-ruby/src/test/java/net/sourceforge/pmd/cpd/RubyTokenizerTest.java
View File

@ -23,7 +23,7 @@ public class RubyTokenizerTest extends CpdTextComparisonTest {
@Override
public Tokenizer newTokenizer(Properties properties) {
return new RubyTokenizer();
return new RubyLanguage().getTokenizer();
}

58
pmd-ruby/src/test/resources/net/sourceforge/pmd/lang/ruby/cpd/testdata/server.txt vendored
View File

@ -5,40 +5,76 @@ L1
L3
[gs] 1 3
[=] 4 5
[tcpserver.open] 7 21
[TCPServer] 7 16
[.] 16 17
[open] 17 21
[(] 21 22
[0] 22 23
[)] 23 24
L4
[addr] 1 5
[=] 7 8
[gs.addr] 9 16
[gs] 9 11
[.] 11 12
[addr] 12 16
L5
[addr.shift] 1 11
[addr] 1 5
[.] 5 6
[shift] 6 11
L7
[while] 1 6
[true] 7 11
L8
[ns] 3 5
[=] 6 7
[gs.accept] 8 17
[gs] 8 10
[.] 10 11
[accept] 11 17
L9
[print] 3 8
[(] 8 9
[ns] 9 11
[,] 11 12
[" is accepted"] 13 27
[)] 27 28
L10
[thread.start] 3 15
[Thread] 3 9
[.] 9 10
[start] 10 15
[do] 16 18
L11
[s] 5 6
[=] 7 8
[ns] 9 11
[ # save to dynamic variable] 33 59
L12
[s.gets] 11 17
[while] 5 10
[s] 11 12
[.] 12 13
[gets] 13 17
L13
[s.write] 7 14
[$_] 15 17
[s] 7 8
[.] 8 9
[write] 9 14
[(] 14 15
[$] 15 16
[_] 16 17
[)] 17 18
L14
[end] 5 8
L15
[print] 5 10
[(] 10 11
[s] 11 12
[" is gone [ 14 37
[,] 12 13
[" is \n gone\n [ 14 37
L18
[)] 37 38
L19
[s.close] 5 12
[s] 5 6
[.] 6 7
[close] 7 12
L20
[end] 3 6
L21
[end] 1 4
EOF

58
pmd-ruby/src/test/resources/net/sourceforge/pmd/lang/ruby/cpd/testdata/tabWidth.txt vendored
View File

@ -5,40 +5,76 @@ L1
L3
[gs] 1 3
[=] 4 5
[tcpserver.open] 7 21
[TCPServer] 7 16
[.] 16 17
[open] 17 21
[(] 21 22
[0] 22 23
[)] 23 24
L4
[addr] 1 5
[=] 7 8
[gs.addr] 9 16
[gs] 9 11
[.] 11 12
[addr] 12 16
L5
[addr.shift] 1 11
[addr] 1 5
[.] 5 6
[shift] 6 11
L7
[while] 1 6
[true] 7 11
L8
[ns] 2 4
[=] 5 6
[gs.accept] 7 16
[gs] 7 9
[.] 9 10
[accept] 10 16
L9
[print] 2 7
[(] 7 8
[ns] 8 10
[,] 10 11
[" is accepted"] 12 26
[)] 26 27
L10
[thread.start] 2 14
[Thread] 2 8
[.] 8 9
[start] 9 14
[do] 15 17
L11
[s] 3 4
[=] 5 6
[ns] 7 9
[ # save to dynamic variable] 31 57
L12
[s.gets] 9 15
[while] 3 8
[s] 9 10
[.] 10 11
[gets] 11 15
L13
[s.write] 4 11
[$_] 12 14
[s] 4 5
[.] 5 6
[write] 6 11
[(] 11 12
[$] 12 13
[_] 13 14
[)] 14 15
L14
[end] 3 6
L15
[print] 3 8
[(] 8 9
[s] 9 10
[" is \t\t gone\t\t [ 12 35
[,] 10 11
[" is \n\t\t gone\n\t\t [ 12 35
L18
[)] 35 36
L19
[s.close] 3 10
[s] 3 4
[.] 4 5
[close] 5 10
L20
[end] 2 5
L21
[end] 1 4
EOF