Skip to content

Commit e9d1c67

Browse files
elegoffelegoff
committed
reformat source code
1 parent 0dea330 commit e9d1c67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+4155
-4421
lines changed

‎community-rust-checks/src/main/java/org/elegoff/rust/checks/CheckList.java

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,19 @@
2020
*/
2121
package org.elegoff.rust.checks;
2222

23-
import java.util.*;
23+
import java.util.Arrays;
24+
import java.util.List;
2425

2526
public class CheckList {
26-
public static final String REPOSITORY_KEY = "community-rust";
27+
public static final String REPOSITORY_KEY = "community-rust";
2728

28-
private CheckList() {
29-
}
29+
private CheckList() {
30+
}
3031

31-
public static List<Class<?>> getRustChecks() {
32-
return Arrays.asList(
33-
LineLengthCheck.class,
34-
FunctionParametersCountCheck.class,
35-
EmptyEnumCheck.class
36-
);
37-
}
32+
public static List<Class<?>> getRustChecks() {
33+
return Arrays.asList(
34+
LineLengthCheck.class,
35+
FunctionParametersCountCheck.class,
36+
EmptyEnumCheck.class);
37+
}
3838
}
39-
40-
41-

‎community-rust-checks/src/main/java/org/elegoff/rust/checks/EmptyEnumCheck.java

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,29 @@
2222

2323
import com.sonar.sslr.api.AstNode;
2424
import com.sonar.sslr.api.AstNodeType;
25-
import org.sonar.check.Rule;
26-
import org.sonar.rust.RustGrammar;
27-
2825
import java.util.Collections;
2926
import java.util.Set;
27+
import org.sonar.check.Rule;
28+
import org.sonar.rust.RustGrammar;
3029

3130
@Rule(key = "EmptyEnum")
3231
public class EmptyEnumCheck extends RustCheck {
33-
@Override
34-
public Set<AstNodeType> subscribedKinds() {
35-
return Collections.singleton(RustGrammar.ENUMERATION);
36-
}
32+
@Override
33+
public Set<AstNodeType> subscribedKinds() {
34+
return Collections.singleton(RustGrammar.ENUMERATION);
35+
}
3736

38-
@Override
39-
public void visitNode(AstNode node) {
40-
AstNode enumItems = node.getFirstChild(RustGrammar.ENUM_ITEMS);
37+
@Override
38+
public void visitNode(AstNode node) {
39+
AstNode enumItems = node.getFirstChild(RustGrammar.ENUM_ITEMS);
4140

42-
if (enumItems == null) {
43-
raiseIssue(node);
44-
}
41+
if (enumItems == null) {
42+
raiseIssue(node);
4543
}
44+
}
4645

47-
private void raiseIssue(AstNode node) {
48-
addIssue("Either remove or fill this empty enumeration.", node);
49-
}
46+
private void raiseIssue(AstNode node) {
47+
addIssue("Either remove or fill this empty enumeration.", node);
48+
}
5049

5150
}
52-
53-

‎community-rust-checks/src/main/java/org/elegoff/rust/checks/FunctionParametersCountCheck.java

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,44 +22,43 @@
2222

2323
import com.sonar.sslr.api.AstNode;
2424
import com.sonar.sslr.api.AstNodeType;
25+
import java.util.Collections;
26+
import java.util.Set;
2527
import org.sonar.check.Rule;
2628
import org.sonar.check.RuleProperty;
2729
import org.sonar.rust.RustGrammar;
2830

29-
import java.util.Collections;
30-
import java.util.Set;
31-
3231
@Rule(key = "FunctionParametersCount")
3332
public class FunctionParametersCountCheck extends RustCheck {
3433

35-
private static final int DEFAULT_MAXIMUM_PARAMETER_COUNT = 8;
34+
private static final int DEFAULT_MAXIMUM_PARAMETER_COUNT = 8;
3635

37-
@RuleProperty(
38-
key = "maximumParameterCount",
39-
description = " Maximum authorized number of parameters",
40-
defaultValue = "" + DEFAULT_MAXIMUM_PARAMETER_COUNT)
41-
public int maximumParameterCount = DEFAULT_MAXIMUM_PARAMETER_COUNT;
36+
@RuleProperty(
37+
key = "maximumParameterCount",
38+
description = " Maximum authorized number of parameters",
39+
defaultValue = "" + DEFAULT_MAXIMUM_PARAMETER_COUNT)
40+
public int maximumParameterCount = DEFAULT_MAXIMUM_PARAMETER_COUNT;
4241

43-
@Override
44-
public Set<AstNodeType> subscribedKinds() {
45-
return Collections.singleton(RustGrammar.FUNCTION);
46-
}
42+
private static int getNumberOfParameters(AstNode node) {
43+
AstNode parameterNameList = node.getFirstChild(RustGrammar.FUNCTION_PARAMETERS);
4744

48-
@Override
49-
public void visitNode(AstNode node) {
50-
int numberOfParameters = getNumberOfParameters(node);
45+
return parameterNameList == null ? 0 : parameterNameList.getChildren(RustGrammar.FUNCTION_PARAM).size();
46+
}
5147

52-
if (numberOfParameters > maximumParameterCount) {
53-
addIssue(
54-
"Reduce the number of parameters that this function takes from " + numberOfParameters + " to at most " + maximumParameterCount + ".",
55-
node);
56-
}
57-
}
48+
@Override
49+
public Set<AstNodeType> subscribedKinds() {
50+
return Collections.singleton(RustGrammar.FUNCTION);
51+
}
5852

59-
private static int getNumberOfParameters(AstNode node) {
60-
AstNode parameterNameList = node.getFirstChild(RustGrammar.FUNCTION_PARAMETERS);
53+
@Override
54+
public void visitNode(AstNode node) {
55+
int numberOfParameters = getNumberOfParameters(node);
6156

62-
return parameterNameList == null ? 0 : parameterNameList.getChildren(RustGrammar.FUNCTION_PARAM).size();
57+
if (numberOfParameters > maximumParameterCount) {
58+
addIssue(
59+
"Reduce the number of parameters that this function takes from " + numberOfParameters + " to at most " + maximumParameterCount + ".",
60+
node);
6361
}
62+
}
6463

6564
}

‎community-rust-checks/src/main/java/org/elegoff/rust/checks/Issue.java

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@
2424

2525
public class Issue {
2626

27-
private final RustCheck check;
28-
private final Integer line;
29-
private final String message;
30-
31-
private Issue(RustCheck check, Integer line, String message) {
32-
this.check = check;
33-
this.line = line;
34-
this.message = message;
35-
}
36-
37-
public static Issue fileIssue(RustCheck check, String message) {
38-
return new Issue(check, null, message);
39-
}
40-
41-
public static Issue lineIssue(RustCheck check, int line, String message) {
42-
return new Issue(check, line, message);
43-
}
44-
45-
public RustCheck check() {
46-
return check;
47-
}
48-
49-
@CheckForNull
50-
public Integer line() {
51-
return line;
52-
}
53-
54-
public String message() {
55-
return message;
56-
}
27+
private final RustCheck check;
28+
private final Integer line;
29+
private final String message;
30+
31+
private Issue(RustCheck check, Integer line, String message) {
32+
this.check = check;
33+
this.line = line;
34+
this.message = message;
35+
}
36+
37+
public static Issue fileIssue(RustCheck check, String message) {
38+
return new Issue(check, null, message);
39+
}
40+
41+
public static Issue lineIssue(RustCheck check, int line, String message) {
42+
return new Issue(check, line, message);
43+
}
44+
45+
public RustCheck check() {
46+
return check;
47+
}
48+
49+
@CheckForNull
50+
public Integer line() {
51+
return line;
52+
}
53+
54+
public String message() {
55+
return message;
56+
}
5757
}

‎community-rust-checks/src/main/java/org/elegoff/rust/checks/LineLengthCheck.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@
2727
@Rule(key = "LineLength")
2828
public class LineLengthCheck extends RustCheck {
2929

30-
private static final int DEFAULT_MAXIMUM_LINE_LENHGTH = 120;
30+
private static final int DEFAULT_MAXIMUM_LINE_LENHGTH = 120;
3131

32-
@RuleProperty(
33-
key = "maximumLineLength",
34-
description = "The maximum authorized line length.",
35-
defaultValue = "" + DEFAULT_MAXIMUM_LINE_LENHGTH)
36-
public int maximumLineLength = DEFAULT_MAXIMUM_LINE_LENHGTH;
32+
@RuleProperty(
33+
key = "maximumLineLength",
34+
description = "The maximum authorized line length.",
35+
defaultValue = "" + DEFAULT_MAXIMUM_LINE_LENHGTH)
36+
public int maximumLineLength = DEFAULT_MAXIMUM_LINE_LENHGTH;
3737

38-
@Override
39-
public void visitFile(AstNode astNode) {
40-
String[] lines = getContext().file().content().split("\\r?\\n");
41-
for (int i = 0; i < lines.length; i++) {
42-
int length = lines[i].length();
43-
if (length > maximumLineLength) {
44-
addLineIssue(
45-
"Split this " + length + " characters long line (which is greater than " + maximumLineLength + " authorized).",
46-
i + 1);
47-
}
48-
}
38+
@Override
39+
public void visitFile(AstNode astNode) {
40+
String[] lines = getContext().file().content().split("\\r?\\n");
41+
for (int i = 0; i < lines.length; i++) {
42+
int length = lines[i].length();
43+
if (length > maximumLineLength) {
44+
addLineIssue(
45+
"Split this " + length + " characters long line (which is greater than " + maximumLineLength + " authorized).",
46+
i + 1);
47+
}
4948
}
49+
}
5050

5151
}

‎community-rust-checks/src/main/java/org/elegoff/rust/checks/RustCheck.java

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,34 @@
2222

2323
import com.sonar.sslr.api.AstNode;
2424
import com.sonar.sslr.api.Token;
25-
import org.sonar.rust.RustVisitor;
26-
import org.sonar.rust.RustVisitorContext;
27-
2825
import java.util.ArrayList;
2926
import java.util.Collections;
3027
import java.util.List;
28+
import org.sonar.rust.RustVisitor;
29+
import org.sonar.rust.RustVisitorContext;
3130

3231
public class RustCheck extends RustVisitor {
33-
private List<Issue> issues = new ArrayList<>();
32+
private final List<Issue> issues = new ArrayList<>();
3433

35-
public List<Issue> scanFileForIssues(RustVisitorContext context) {
36-
issues.clear();
37-
scanFile(context);
38-
return Collections.unmodifiableList(new ArrayList<>(issues));
39-
}
34+
public List<Issue> scanFileForIssues(RustVisitorContext context) {
35+
issues.clear();
36+
scanFile(context);
37+
return Collections.unmodifiableList(new ArrayList<>(issues));
38+
}
4039

41-
public void addIssue(String message, AstNode node) {
42-
addIssue(message, node.getToken());
43-
}
40+
public void addIssue(String message, AstNode node) {
41+
addIssue(message, node.getToken());
42+
}
4443

45-
public void addIssue(String message, Token token) {
46-
addLineIssue(message, token.getLine());
47-
}
44+
public void addIssue(String message, Token token) {
45+
addLineIssue(message, token.getLine());
46+
}
4847

49-
public void addLineIssue(String message, int line) {
50-
issues.add(Issue.lineIssue(this, line, message));
51-
}
48+
public void addLineIssue(String message, int line) {
49+
issues.add(Issue.lineIssue(this, line, message));
50+
}
5251

53-
public void addFileIssue(String message) {
54-
issues.add(Issue.fileIssue(this, message));
55-
}
52+
public void addFileIssue(String message) {
53+
issues.add(Issue.fileIssue(this, message));
54+
}
5655
}

‎community-rust-checks/src/main/resources/org/elegoff/I10n/rust/rules/EmptyEnum.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
{
32
"title": "Enum should not be left empty",
43
"type": "CODE_SMELL",
@@ -13,4 +12,4 @@
1312
"defaultSeverity": "Major",
1413
"sqKey": "EmptyEnum",
1514
"scope": "All"
16-
}
15+
}

‎community-rust-checks/src/main/resources/org/elegoff/I10n/rust/rules/FunctionParametersCount.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<p>Functions with excessive parameters are difficult to use, as one needs to figure out what each parameter is.</p>
2-
<p>In many cases, the procedure can either be split into several smaller ones, or a better data structure can be found.</p>
2+
<p>In many cases, the procedure can either be split into several smaller ones, or a better data structure can be
3+
found.</p>
34
<p>This rule verifies that each function has at most the given number of parameters.</p>
45
<h2>Noncompliant Code Example</h2>
56
<pre>

‎community-rust-frontend/src/main/java/org/sonar/rust/RustFile.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
*/
2121
package org.sonar.rust;
2222

23-
24-
2523
import java.net.URI;
2624

2725
public interface RustFile {
2826

29-
String name();
27+
String name();
3028

31-
String content();
29+
String content();
3230

33-
URI uri();
31+
URI uri();
3432

3533
}

0 commit comments

Comments
 (0)