This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 2e7a2e9 [NETBEANS-4337] Code Sniffer standard is optional
new afd1a95 Merge pull request #2149 from KacerCZ/netbeans-4337
2e7a2e9 is described below
commit 2e7a2e98a2908dbed3897565621073ef263b286f
Author: Tomas Prochazka <ka...@razdva.cz>
AuthorDate: Wed May 20 22:05:48 2020 +0200
[NETBEANS-4337] Code Sniffer standard is optional
Code Sniffer can be run without parameter '--standard'. In that case it is
looking for configuration file in project root.
---
.../modules/php/analysis/commands/CodeSniffer.java | 17 +++--------------
.../php/analysis/options/AnalysisOptionsValidator.java | 2 +-
.../analysis/ui/CodeSnifferStandardsComboBoxModel.java | 3 +--
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodeSniffer.java
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodeSniffer.java
index e18d698..77a487e 100644
---
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodeSniffer.java
+++
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodeSniffer.java
@@ -137,7 +137,7 @@ public final class CodeSniffer {
assert file.isValid() : "Invalid file given: " + file;
try {
Integer result =
getExecutable(Bundle.CodeSniffer_analyze(analyzeGroupCounter++),
findWorkDir(file))
-
.additionalParameters(getParameters(ensureStandard(standard), file,
noRecursion))
+ .additionalParameters(getParameters(standard, file,
noRecursion))
.runAndWait(getDescriptor(), "Running code sniffer...");
// NOI18N
if (result == null) {
return null;
@@ -239,7 +239,8 @@ public final class CodeSniffer {
Charset encoding = FileEncodingQuery.getEncoding(file);
List<String> params = new ArrayList<>();
// NETBEANS-3243 the path of Code Sniffer may have --standard parameter
- if (!codeSnifferPath.contains(STANDARD_PARAM + "=") // NOI18N
+ if (StringUtils.hasText(standard)
+ && !codeSnifferPath.contains(STANDARD_PARAM + "=") // NOI18N
&& !codeSnifferPath.contains(STANDARD_PARAM + " ")) { // NOI18N
// #270987 use --standard
params.add(String.format(STANDARD_PARAM_FORMAT, standard));
@@ -255,18 +256,6 @@ public final class CodeSniffer {
return params;
}
- private String ensureStandard(String standard) {
- if (standard != null) {
- return standard;
- }
- List<String> standards = getStandards();
- if (standards == null) {
- // fallback
- return "PEAR"; // NOI18N
- }
- return standards.get(0);
- }
-
private void addIgnoredFiles(List<String> params, FileObject file) {
Collection<FileObject> ignoredFiles =
Queries.getVisibilityQuery(PhpModule.Factory.forFileObject(file)).getCodeAnalysisExcludeFiles();
if (ignoredFiles.isEmpty()) {
diff --git
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/options/AnalysisOptionsValidator.java
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/options/AnalysisOptionsValidator.java
index c920289..45b3790 100644
---
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/options/AnalysisOptionsValidator.java
+++
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/options/AnalysisOptionsValidator.java
@@ -73,7 +73,7 @@ public final class AnalysisOptionsValidator {
@NbBundle.Messages("AnalysisOptionsValidator.codeSniffer.standard.empty=Valid
code sniffer standard must be set.")
public AnalysisOptionsValidator validateCodeSnifferStandard(String
codeSnifferStandard) {
- if (!StringUtils.hasText(codeSnifferStandard)) {
+ if (codeSnifferStandard == null) {
result.addWarning(new
ValidationResult.Message("codeSniffer.standard",
Bundle.AnalysisOptionsValidator_codeSniffer_standard_empty())); // NOI18N
}
return this;
diff --git
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/CodeSnifferStandardsComboBoxModel.java
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/CodeSnifferStandardsComboBoxModel.java
index 4776b4d..8ae48cf 100644
---
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/CodeSnifferStandardsComboBoxModel.java
+++
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/CodeSnifferStandardsComboBoxModel.java
@@ -107,8 +107,7 @@ public final class CodeSnifferStandardsComboBoxModel
extends AbstractListModel<S
@CheckForNull
public String getSelectedStandard() {
if (selectedStandard == NO_STANDARDS_AVAILABLE
- || selectedStandard == FETCHING_STANDARDS
- || selectedStandard.isEmpty()) {
+ || selectedStandard == FETCHING_STANDARDS ) {
return null;
}
return selectedStandard;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
