This is an automated email from the ASF dual-hosted git repository.
tmysik 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 d349186 [NETBEANS-4573] PHP CS Fixer doesn't work with a directory
and a file
new b424035 Merge pull request #2254 from
junichi11/netbeans-4573-phpcsfixer-issue
d349186 is described below
commit d3491862d28562c0b3e95e7bd4f9a088e197071c
Author: Junichi Yamamoto <[email protected]>
AuthorDate: Tue Jul 14 20:04:03 2020 +0900
[NETBEANS-4573] PHP CS Fixer doesn't work with a directory and a file
---
.../modules/php/analysis/commands/CodingStandardsFixer.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java
index 62ba3ef..87368e3 100644
---
a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java
+++
b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/commands/CodingStandardsFixer.java
@@ -172,15 +172,17 @@ public final class CodingStandardsFixer {
public List<Result> analyze(CodingStandardsFixerParams params, FileObject
file) {
assert file.isValid() : "Invalid file given: " + file;
try {
-
- Integer result =
getExecutable(Bundle.CodingStandardsFixer_analyze(analyzeGroupCounter++),
findWorkDir(file))
+ File workDir = findWorkDir(file);
+ Integer result =
getExecutable(Bundle.CodingStandardsFixer_analyze(analyzeGroupCounter++),
workDir)
.additionalParameters(getParameters(params, file))
.runAndWait(getDescriptor(), "Running coding standards
fixer..."); // NOI18N
if (result == null) {
return null;
}
-
- return CodingStandardsFixerReportParser.parse(XML_LOG, file);
+ // if the project for the file is not found(i.e. if the workDir is
not found),
+ // the results are not shown in the inspector window
+ FileObject root = workDir != null ? FileUtil.toFileObject(workDir)
: file;
+ return CodingStandardsFixerReportParser.parse(XML_LOG, root);
} catch (CancellationException ex) {
// cancelled
return Collections.emptyList();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
