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 2b8ee8b50b Using code generator actions should not take focus from
editor. (#3961)
2b8ee8b50b is described below
commit 2b8ee8b50ba6d3f9f4e87ae35d0057148372daca
Author: Dusan Balek <[email protected]>
AuthorDate: Tue Apr 12 09:07:35 2022 +0200
Using code generator actions should not take focus from editor. (#3961)
---
.../modules/java/lsp/server/protocol/ConstructorGenerator.java | 2 +-
.../modules/java/lsp/server/protocol/DelegateMethodGenerator.java | 2 +-
.../modules/java/lsp/server/protocol/EqualsHashCodeGenerator.java | 6 +++---
.../modules/java/lsp/server/protocol/GetterSetterGenerator.java | 6 +++---
.../java/lsp/server/protocol/ImplementOverrideMethodGenerator.java | 5 +++--
.../netbeans/modules/java/lsp/server/protocol/LoggerGenerator.java | 2 +-
.../modules/java/lsp/server/protocol/ToStringGenerator.java | 2 +-
7 files changed, 13 insertions(+), 12 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 1528927e10..1208936076 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
@@ -179,7 +179,7 @@ public final class ConstructorGenerator extends
CodeActionsProvider {
data.put(OFFSET, startOffset);
data.put(CONSTRUCTORS, constructors);
data.put(FIELDS, fields);
- return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateConstructor(),
isSource ? CODE_GENERATOR_KIND : CodeActionKind.QuickFix, data, null));
+ return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateConstructor(),
isSource ? CODE_GENERATOR_KIND : CodeActionKind.QuickFix, data,
"workbench.action.focusActiveEditorGroup"));
}
@Override
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 9673e31cec..2f96f9f888 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
@@ -126,7 +126,7 @@ public final class DelegateMethodGenerator extends
CodeActionsProvider {
data.put(OFFSET, offset);
data.put(TYPE, typeItem);
data.put(FIELDS, fields);
- return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateDelegateMethod(),
CODE_GENERATOR_KIND, data, null));
+ return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateDelegateMethod(),
CODE_GENERATOR_KIND, data, "workbench.action.focusActiveEditorGroup"));
}
@Override
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 2554aa24f3..4c102270e5 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
@@ -111,11 +111,11 @@ public final class EqualsHashCodeGenerator extends
CodeActionsProvider {
String uri = Utils.toUri(info.getFileObject());
if (equalsHashCode[0] == null) {
if (equalsHashCode[1] == null) {
- return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateEqualsHashCode(),
CODE_GENERATOR_KIND, data(0, uri, offset, fields), null));
+ return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateEqualsHashCode(),
CODE_GENERATOR_KIND, data(0, uri, offset, fields),
"workbench.action.focusActiveEditorGroup"));
}
- return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateEquals(),
CODE_GENERATOR_KIND, data(EQUALS_ONLY, uri, offset, fields), null));
+ return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateEquals(),
CODE_GENERATOR_KIND, data(EQUALS_ONLY, uri, offset, fields),
"workbench.action.focusActiveEditorGroup"));
}
- return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateHashCode(),
CODE_GENERATOR_KIND, data(HASH_CODE_ONLY, uri, offset, fields), null));
+ return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateHashCode(),
CODE_GENERATOR_KIND, data(HASH_CODE_ONLY, uri, offset, fields),
"workbench.action.focusActiveEditorGroup"));
}
@Override
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 c4e3928535..5716a69499 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
@@ -104,7 +104,7 @@ public final class GetterSetterGenerator extends
CodeActionsProvider {
QuickPickItem item = new QuickPickItem(createLabel(info,
variableElement));
item.setUserData(new ElementData(variableElement));
return item;
- }).collect(Collectors.toList())), null));
+ }).collect(Collectors.toList())), all && pair.first().size() > 1 ?
"workbench.action.focusActiveEditorGroup" : null));
}
if (missingSetters) {
String name = pair.second().size() == 1 ?
Bundle.DN_GenerateSetterFor(pair.second().iterator().next().getSimpleName().toString())
: Bundle.DN_GenerateSetters();
@@ -112,7 +112,7 @@ public final class GetterSetterGenerator extends
CodeActionsProvider {
QuickPickItem item = new QuickPickItem(createLabel(info,
variableElement));
item.setUserData(new ElementData(variableElement));
return item;
- }).collect(Collectors.toList())), null));
+ }).collect(Collectors.toList())), all && pair.first().size() > 1 ?
"workbench.action.focusActiveEditorGroup" : null));
}
if (missingGetters && missingSetters) {
pair.first().retainAll(pair.second());
@@ -121,7 +121,7 @@ public final class GetterSetterGenerator extends
CodeActionsProvider {
QuickPickItem item = new QuickPickItem(createLabel(info,
variableElement));
item.setUserData(new ElementData(variableElement));
return item;
- }).collect(Collectors.toList())), null));
+ }).collect(Collectors.toList())), all && pair.first().size() > 1 ?
"workbench.action.focusActiveEditorGroup" : null));
}
return result;
}
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 8a398f4f2a..5a3c72418f 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
@@ -40,6 +40,7 @@ import javax.lang.model.element.TypeElement;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.CodeActionKind;
import org.eclipse.lsp4j.CodeActionParams;
+import org.eclipse.lsp4j.Command;
import org.eclipse.lsp4j.TextEdit;
import org.eclipse.lsp4j.WorkspaceEdit;
import org.netbeans.api.java.source.CompilationController;
@@ -105,7 +106,7 @@ public final class ImplementOverrideMethodGenerator extends
CodeActionsProvider
implementMethods.add(new QuickPickItem(createLabel(info,
method), enclosingTypeName, null, mustImplement, new ElementData(method)));
}
if (!implementMethods.isEmpty()) {
-
result.add(createCodeAction(Bundle.DN_GenerateImplementMethod(),
CODE_GENERATOR_KIND, data(uri, offset, true, implementMethods), null));
+
result.add(createCodeAction(Bundle.DN_GenerateImplementMethod(),
CODE_GENERATOR_KIND, data(uri, offset, true, implementMethods),
"workbench.action.focusActiveEditorGroup"));
}
}
if (typeElement.getKind().isClass() ||
typeElement.getKind().isInterface()) {
@@ -121,7 +122,7 @@ public final class ImplementOverrideMethodGenerator extends
CodeActionsProvider
overrideMethods.add(item);
}
if (!overrideMethods.isEmpty()) {
-
result.add(createCodeAction(Bundle.DN_GenerateOverrideMethod(),
CODE_GENERATOR_KIND, data (uri, offset, false, overrideMethods), null));
+
result.add(createCodeAction(Bundle.DN_GenerateOverrideMethod(),
CODE_GENERATOR_KIND, data (uri, offset, false, overrideMethods),
"workbench.action.focusActiveEditorGroup"));
}
}
return result;
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 14220ace18..bc235807d7 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
@@ -105,7 +105,7 @@ public final class LoggerGenerator extends
CodeActionsProvider {
Map<String, Object> data = new HashMap<>();
data.put(URI, uri);
data.put(OFFSET, offset);
- return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateLogger(),
CODE_GENERATOR_KIND, data, null));
+ return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateLogger(),
CODE_GENERATOR_KIND, data, "workbench.action.focusActiveEditorGroup"));
}
@Override
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 f862f38605..72d9e7e3dd 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
@@ -112,7 +112,7 @@ public final class ToStringGenerator extends
CodeActionsProvider {
data.put(URI, uri);
data.put(OFFSET, offset);
data.put(FIELDS, fields);
- return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateToString(),
CODE_GENERATOR_KIND, data, null));
+ return
Collections.singletonList(createCodeAction(Bundle.DN_GenerateToString(),
CODE_GENERATOR_KIND, data, fields.isEmpty() ? null :
"workbench.action.focusActiveEditorGroup"));
}
@Override
---------------------------------------------------------------------
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
