This is an automated email from the ASF dual-hosted git repository.
dbalek 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 ff8747ce3c LSP: Modified to prevent NPEs.
new f75da6ef22 Merge pull request #6444 from dbalek/dbalek/lsp-npe-fixes
ff8747ce3c is described below
commit ff8747ce3ce481a73bf793a2234d81b579c63883
Author: Dusan Balek <dusan.ba...@oracle.com>
AuthorDate: Wed Sep 13 15:32:55 2023 +0200
LSP: Modified to prevent NPEs.
---
.../netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java | 2 +-
.../modules/java/lsp/server/protocol/DelegateMethodGenerator.java | 2 +-
.../modules/java/lsp/server/protocol/EqualsHashCodeGenerator.java | 2 +-
.../modules/java/lsp/server/protocol/GetterSetterGenerator.java | 2 +-
.../java/lsp/server/protocol/ImplementOverrideMethodGenerator.java | 2 +-
.../org/netbeans/modules/java/lsp/server/protocol/LoggerGenerator.java | 2 +-
.../modules/java/lsp/server/protocol/OrganizeImportsCodeAction.java | 2 +-
.../org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java | 2 +-
.../netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java | 2 +-
.../modules/java/lsp/server/protocol/TextDocumentServiceImpl.java | 2 +-
.../netbeans/modules/java/lsp/server/protocol/ToStringGenerator.java | 2 +-
.../java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java | 2 +-
.../lsp/server/refactoring/ExtractSuperclassOrInterfaceRefactoring.java | 2 +-
.../netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java | 2 +-
.../netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java | 2 +-
.../modules/java/lsp/server/refactoring/PushDownRefactoring.java | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java
index 2db3dac827..6d932ec40a 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ConstructorGenerator.java
@@ -92,7 +92,7 @@ public final class ConstructorGenerator extends
CodeActionsProvider {
"DN_GenerateConstructor=Generate Constructor...",
})
public List<CodeAction> getCodeActions(ResultIterator resultIterator,
CodeActionParams params) throws Exception {
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/DelegateMethodGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/DelegateMethodGenerator.java
index 5004e793ee..52dd026f75 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/DelegateMethodGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/DelegateMethodGenerator.java
@@ -90,7 +90,7 @@ public final class DelegateMethodGenerator extends
CodeActionsProvider {
if (only == null || !only.contains(CodeActionKind.Source)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/EqualsHashCodeGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/EqualsHashCodeGenerator.java
index 8f4968a8d4..53462077ec 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/EqualsHashCodeGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/EqualsHashCodeGenerator.java
@@ -80,7 +80,7 @@ public final class EqualsHashCodeGenerator extends
CodeActionsProvider {
if (only == null || !only.contains(CodeActionKind.Source)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/GetterSetterGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/GetterSetterGenerator.java
index 1dbd16a6db..87fce47ac1 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/GetterSetterGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/GetterSetterGenerator.java
@@ -87,7 +87,7 @@ public final class GetterSetterGenerator extends
CodeActionsProvider {
"DN_GenerateGetterSetterFor=Generate Getter and Setter for \"{0}\"",
})
public List<CodeAction> getCodeActions(ResultIterator resultIterator,
CodeActionParams params) throws Exception {
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ImplementOverrideMethodGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ImplementOverrideMethodGenerator.java
index ef04a84e85..119a40cb06 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ImplementOverrideMethodGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ImplementOverrideMethodGenerator.java
@@ -80,7 +80,7 @@ public final class ImplementOverrideMethodGenerator extends
CodeActionsProvider
if (only == null || !only.contains(CodeActionKind.Source)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LoggerGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LoggerGenerator.java
index 83b130c3e9..d39a5d997f 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LoggerGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LoggerGenerator.java
@@ -80,7 +80,7 @@ public final class LoggerGenerator extends
CodeActionsProvider {
if (only == null || !only.contains(CodeActionKind.Source)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/OrganizeImportsCodeAction.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/OrganizeImportsCodeAction.java
index c16187c700..d912c42c95 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/OrganizeImportsCodeAction.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/OrganizeImportsCodeAction.java
@@ -53,7 +53,7 @@ public final class OrganizeImportsCodeAction extends
CodeActionsProvider {
if (only == null || !only.contains(CodeActionKind.Source) &&
!only.contains(CodeActionKind.SourceOrganizeImports)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java
index c7bff0f383..d375067eee 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java
@@ -97,7 +97,7 @@ public final class SurroundWithHint extends
CodeActionsProvider {
"DN_SurroundWithAll=Surround with ...",
})
public List<CodeAction> getCodeActions(ResultIterator resultIterator,
CodeActionParams params) throws Exception {
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java
index cc1d3a0032..0df6ff065a 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestClassGenerator.java
@@ -84,7 +84,7 @@ public final class TestClassGenerator extends
CodeActionsProvider {
"DN_GenerateTestClass=Create Test Class [{0} in {1}]"
})
public List<CodeAction> getCodeActions(ResultIterator resultIterator,
CodeActionParams params) throws Exception {
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
index 75bd96a18e..7401da39a2 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
@@ -1025,7 +1025,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
}
if (client.getNbCodeCapabilities().wantsJavaSupport())
{
//introduce hints:
- CompilationController cc =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController cc =
resultIterator.getParserResult() != null ?
CompilationController.get(resultIterator.getParserResult()) : null;
if (cc != null) {
cc.toPhase(JavaSource.Phase.RESOLVED);
if (!range.getStart().equals(range.getEnd())) {
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ToStringGenerator.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ToStringGenerator.java
index af2901473e..223866044d 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ToStringGenerator.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/ToStringGenerator.java
@@ -77,7 +77,7 @@ public final class ToStringGenerator extends
CodeActionsProvider {
if (only == null || !only.contains(CodeActionKind.Source)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
index 578a5f24ef..e00d42b891 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ChangeMethodParametersRefactoring.java
@@ -90,7 +90,7 @@ public final class ChangeMethodParametersRefactoring extends
CodeRefactoring {
if (only == null || !only.contains(CodeActionKind.Refactor)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null ||
!JavaRefactoringUtils.isRefactorable(info.getFileObject())) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ExtractSuperclassOrInterfaceRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ExtractSuperclassOrInterfaceRefactoring.java
index 4303235dbd..8b434156f0 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ExtractSuperclassOrInterfaceRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/ExtractSuperclassOrInterfaceRefactoring.java
@@ -96,7 +96,7 @@ public final class ExtractSuperclassOrInterfaceRefactoring
extends CodeRefactori
if (only == null || !only.contains(CodeActionKind.Refactor)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null ||
!JavaRefactoringUtils.isRefactorable(info.getFileObject())) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
index 8b1ce315ac..9890157d19 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
@@ -113,7 +113,7 @@ public final class MoveRefactoring extends CodeRefactoring {
if (only == null || !only.contains(CodeActionKind.Refactor)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null ||
!JavaRefactoringUtils.isRefactorable(info.getFileObject())) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java
index ca063171ba..c30be2e246 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PullUpRefactoring.java
@@ -89,7 +89,7 @@ public final class PullUpRefactoring extends CodeRefactoring {
if (only == null || !only.contains(CodeActionKind.Refactor)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null ||
!JavaRefactoringUtils.isRefactorable(info.getFileObject())) {
return Collections.emptyList();
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PushDownRefactoring.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PushDownRefactoring.java
index 0bbc84c123..0f8dd2e18a 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PushDownRefactoring.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/PushDownRefactoring.java
@@ -85,7 +85,7 @@ public final class PushDownRefactoring extends
CodeRefactoring {
if (only == null || !only.contains(CodeActionKind.Refactor)) {
return Collections.emptyList();
}
- CompilationController info =
CompilationController.get(resultIterator.getParserResult());
+ CompilationController info = resultIterator.getParserResult() != null
? CompilationController.get(resultIterator.getParserResult()) : null;
if (info == null ||
!JavaRefactoringUtils.isRefactorable(info.getFileObject())) {
return Collections.emptyList();
}
---------------------------------------------------------------------
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
