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

Delete old CPD Language interface

Browse Source 
reorganize cpd modules
This commit is contained in:
Clément Fournier
2023-02-12 17:32:56 +01:00
parent 8fbd830daa
commit fb9f49624d
87 changed files with 402 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pmd-swift/src/main/java/net/sourceforge/pmd/cpd/SwiftLanguage.java
View File

@ -1,18 +0,0 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
/**
* Language implementation for Swift
*/
public class SwiftLanguage extends AbstractLanguage {
/**
* Creates a new Swift Language instance.
*/
public SwiftLanguage() {
super("Swift", "swift", new SwiftTokenizer(), ".swift");
}
}

8
pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/SwiftLanguageModule.java
View File

@ -4,7 +4,10 @@
package net.sourceforge.pmd.lang.swift;
import net.sourceforge.pmd.cpd.Tokenizer;
import net.sourceforge.pmd.lang.LanguagePropertyBundle;
import net.sourceforge.pmd.lang.impl.SimpleLanguageModuleBase;
import net.sourceforge.pmd.lang.swift.cpd.SwiftTokenizer;
/**
* Language Module for Swift
@ -22,4 +25,9 @@ public class SwiftLanguageModule extends SimpleLanguageModuleBase {
public SwiftLanguageModule() {
super(LanguageMetadata.withId(TERSE_NAME).name(NAME).extensions("swift"), new SwiftHandler());
}
@Override
public Tokenizer createCpdTokenizer(LanguagePropertyBundle bundle) {
return new SwiftTokenizer();
}
}

4
pmd-swift/src/main/java/net/sourceforge/pmd/cpd/SwiftTokenizer.java → pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/cpd/SwiftTokenizer.java
View File

@ -1,8 +1,8 @@
/**
/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
package net.sourceforge.pmd.lang.swift.cpd;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Lexer;

4
pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/AbstractSwiftRule.java → pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/rule/AbstractSwiftRule.java
View File

@ -1,8 +1,8 @@
/**
/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.swift;
package net.sourceforge.pmd.lang.swift.rule;
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.lang.ast.AstVisitor;

2
pmd-swift/src/main/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/UnavailableFunctionRule.java
View File

@ -8,7 +8,7 @@ import java.util.List;
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.lang.ast.AstVisitor;
import net.sourceforge.pmd.lang.swift.AbstractSwiftRule;
import net.sourceforge.pmd.lang.swift.rule.AbstractSwiftRule;
import net.sourceforge.pmd.lang.swift.ast.SwiftParser.SwAttribute;
import net.sourceforge.pmd.lang.swift.ast.SwiftParser.SwAttributes;
import net.sourceforge.pmd.lang.swift.ast.SwiftParser.SwCodeBlock;

1
pmd-swift/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
View File

@ -1 +0,0 @@
net.sourceforge.pmd.cpd.SwiftLanguage

13
pmd-swift/src/test/java/net/sourceforge/pmd/cpd/SwiftTokenizerTest.java → pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/cpd/SwiftTokenizerTest.java
View File

@ -1,25 +1,20 @@
/**
/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
package net.sourceforge.pmd.lang.swift.cpd;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
import net.sourceforge.pmd.lang.swift.SwiftLanguageModule;
class SwiftTokenizerTest extends CpdTextComparisonTest {
SwiftTokenizerTest() {
super(".swift");
super(SwiftLanguageModule.TERSE_NAME, ".swift");
}
@Override
protected String getResourcePrefix() {
return "../lang/swift/cpd/testdata";
}
@Test
void testSwift42() {
doTest("Swift4.2");