Skip to content

Commit

Permalink
Add Run with configuration into code lenses.
Browse files Browse the repository at this point in the history
  • Loading branch information
@entlicher
entlicher committed Jun 23, 2021
1 parent 553191f commit 5f0acca
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 9 deletions.
76 changes: 74 additions & 2 deletions ...lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.net.URL;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumMap;
import java.util.EnumSet;
Expand All @@ -51,6 +52,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import java.util.function.IntFunction;
import java.util.logging.Level;
Expand Down Expand Up @@ -148,6 +150,7 @@
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.lsp.Completion;
import org.netbeans.api.lsp.HyperlinkLocation;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
Expand Down Expand Up @@ -189,12 +192,17 @@
import org.netbeans.spi.editor.hints.ErrorDescription;
import org.netbeans.spi.editor.hints.Fix;
import org.netbeans.spi.lsp.ErrorProvider;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.ProjectConfiguration;
import org.netbeans.spi.project.ProjectConfigurationProvider;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
import org.openide.text.NbDocument;
import org.openide.text.PositionBounds;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.util.Union2;
import org.openide.util.WeakSet;
Expand All @@ -208,6 +216,9 @@
public class TextDocumentServiceImpl implements TextDocumentService, LanguageClientAware {
private static final Logger LOG = Logger.getLogger(TextDocumentServiceImpl.class.getName());

private static final String COMMAND_RUN_SINGLE = "java.run.single"; // NOI18N
private static final String COMMAND_DEBUG_SINGLE = "java.debug.single"; // NOI18N

private static final RequestProcessor BACKGROUND_TASKS = new RequestProcessor(TextDocumentServiceImpl.class.getName(), 1, false, false);
private static final RequestProcessor WORKER = new RequestProcessor(TextDocumentServiceImpl.class.getName(), 1, false, false);

Expand Down Expand Up @@ -884,6 +895,10 @@ public CompletableFuture<List<Either<Command, CodeAction>>> codeAction(CodeActio

private ConcurrentHashMap<String, Boolean> upToDateTests = new ConcurrentHashMap<>();

@NbBundle.Messages({"# {0} - method name", "LBL_Run=Run {0}",
"# {0} - method name", "LBL_Debug=Debug {0}",
"# {0} - method name", "# {1} - configuration name", "LBL_RunWith=Run {0} with {1}",
"# {0} - method name", "# {1} - configuration name", "LBL_DebugWith=Debug {0} with {1}"})
@Override
public CompletableFuture<List<? extends CodeLens>> codeLens(CodeLensParams params) {
// shortcut: if the projects are not yet initialized, return empty:
Expand Down Expand Up @@ -932,18 +947,36 @@ public CompletableFuture<List<? extends CodeLens>> codeLens(CodeLensParams param
}
//look for main methods:
List<CodeLens> lens = new ArrayList<>();
AtomicReference<List<Pair<String, String>>> projectConfigurations = new AtomicReference<>();
new TreePathScanner<Void, Void>() {
public Void visitMethod(MethodTree tree, Void p) {
Element el = cc.getTrees().getElement(getCurrentPath());
if (el != null && el.getKind() == ElementKind.METHOD && SourceUtils.isMainMethod((ExecutableElement) el)) {
Range range = Utils.treeRange(cc, tree);
List<Object> arguments = Collections.singletonList(params.getTextDocument().getUri());
String method = el.getSimpleName().toString();
lens.add(new CodeLens(range,
new Command("Run main", "java.run.single", arguments),
new Command(Bundle.LBL_Run(method), COMMAND_RUN_SINGLE, arguments),
null));
lens.add(new CodeLens(range,
new Command("Debug main", "java.debug.single", arguments),
new Command(Bundle.LBL_Debug(method), COMMAND_DEBUG_SINGLE, arguments),
null));
// Run and Debug configurations:
List<Pair<String, String>> configs = projectConfigurations.accumulateAndGet(null, (l, nul) -> l == null ? getProjectConfigurations(source) : l);
for (Pair<String, String> config : configs) {
String runConfig = config.first();
if (runConfig != null) {
lens.add(new CodeLens(range,
new Command(Bundle.LBL_RunWith(method, runConfig), COMMAND_RUN_SINGLE, Arrays.asList(params.getTextDocument().getUri(), null, runConfig)),
null));
}
String debugConfig = config.second();
if (debugConfig != null) {
lens.add(new CodeLens(range,
new Command(Bundle.LBL_DebugWith(method, debugConfig), COMMAND_DEBUG_SINGLE, Arrays.asList(params.getTextDocument().getUri(), null, debugConfig)),
null));
}
}
}
return null;
}
Expand All @@ -956,6 +989,45 @@ public Void visitMethod(MethodTree tree, Void p) {
return result;
}

private List<Pair<String, String>> getProjectConfigurations(JavaSource source) {
for (FileObject fo : source.getFileObjects()) {
Project p = FileOwnerQuery.getOwner(fo);
if (p != null) {
ProjectConfigurationProvider<ProjectConfiguration> configProvider = p.getLookup().lookup(ProjectConfigurationProvider.class);
ActionProvider actionProvider = p.getLookup().lookup(ActionProvider.class);
List<Pair<String, String>> configDispNames = new ArrayList<>();
if (configProvider != null && actionProvider != null) {
boolean skippedFirst = false;
for (ProjectConfiguration configuration : configProvider.getConfigurations()) {
if (skippedFirst) {
String runConfig = null;
String debugConfig = null;
Lookup configLookup = Lookups.fixed(fo, configuration);
if (isConfigurationAction(configProvider, actionProvider, configLookup, ActionProvider.COMMAND_RUN_SINGLE)) {
runConfig = configuration.getDisplayName();
}
if (isConfigurationAction(configProvider, actionProvider, configLookup, ActionProvider.COMMAND_DEBUG_SINGLE)) {
debugConfig = configuration.getDisplayName();
}
if (runConfig != null || debugConfig != null) {
configDispNames.add(Pair.of(runConfig, debugConfig));
}
} else {
// Ignore the default config
skippedFirst = true;
}
}
}
return configDispNames;
}
}
return Collections.emptyList();
}

private static boolean isConfigurationAction(ProjectConfigurationProvider<ProjectConfiguration> configProvider, ActionProvider actionProvider, Lookup configLookup, String action) {
return configProvider.configurationsAffectAction(action) && actionProvider.isActionEnabled(action, configLookup);
}

@Override
public CompletableFuture<CodeLens> resolveCodeLens(CodeLens arg0) {
throw new UnsupportedOperationException("Not supported yet.");
Expand Down
15 changes: 8 additions & 7 deletions java/java.lsp.server/vscode/src/extension.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
]);
}
}));
const runDebug = async (noDebug: boolean, testRun: boolean, uri: string, methodName?: string) => {
const runDebug = async (noDebug: boolean, testRun: boolean, uri: string, methodName?: string, launchConfiguration?: string) => {
const docUri = uri ? vscode.Uri.file(uri) : window.activeTextEditor?.document.uri;
if (docUri) {
const workspaceFolder = vscode.workspace.getWorkspaceFolder(docUri);
Expand All @@ -293,6 +293,7 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
request: "launch",
mainClass: uri,
methodName,
launchConfiguration,
testRun
};
const debugOptions : vscode.DebugSessionOptions = {
Expand All @@ -307,14 +308,14 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
}) : ret;
}
};
context.subscriptions.push(commands.registerCommand('java.run.test', async (uri, methodName?) => {
await runDebug(true, true, uri, methodName);
context.subscriptions.push(commands.registerCommand('java.run.test', async (uri, methodName?, launchConfiguration?) => {
await runDebug(true, true, uri, methodName, launchConfiguration);
}));
context.subscriptions.push(commands.registerCommand('java.run.single', async (uri, methodName?) => {
await runDebug(true, false, uri, methodName);
context.subscriptions.push(commands.registerCommand('java.run.single', async (uri, methodName?, launchConfiguration?) => {
await runDebug(true, false, uri, methodName, launchConfiguration);
}));
context.subscriptions.push(commands.registerCommand('java.debug.single', async (uri, methodName?) => {
await runDebug(false, false, uri, methodName);
context.subscriptions.push(commands.registerCommand('java.debug.single', async (uri, methodName?, launchConfiguration?) => {
await runDebug(false, false, uri, methodName, launchConfiguration);
}));

// get the Test Explorer extension and register TestAdapter
Expand Down

0 comments on commit 5f0acca

Please sign in to comment.