This is an automated email from the ASF dual-hosted git repository.
jhorvath pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new ac29761846 Set DB environment for java+ as well as for java
new 9032ecc28e Merge pull request #6248 from jhorvath/db-env
ac29761846 is described below
commit ac297618465578bca2792bf2de210daf9d2d60f8
Author: Jan Horvath <j...@horvath.cz>
AuthorDate: Tue Jul 25 09:24:57 2023 +0200
Set DB environment for java+ as well as for java
---
java/java.lsp.server/vscode/src/dbConfigurationProvider.ts | 6 ++++--
java/java.lsp.server/vscode/src/extension.ts | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/dbConfigurationProvider.ts
b/java/java.lsp.server/vscode/src/dbConfigurationProvider.ts
index 79b094fe69..361a6c7954 100644
--- a/java/java.lsp.server/vscode/src/dbConfigurationProvider.ts
+++ b/java/java.lsp.server/vscode/src/dbConfigurationProvider.ts
@@ -35,7 +35,7 @@ export async function initializeRunConfiguration():
Promise<boolean> {
return false;
}
-export class DBConfigurationProvider implements
vscode.DebugConfigurationProvider {
+class DBConfigurationProvider implements vscode.DebugConfigurationProvider {
resolveDebugConfiguration(_folder: vscode.WorkspaceFolder | undefined,
config: vscode.DebugConfiguration, _token?: vscode.CancellationToken):
vscode.ProviderResult<vscode.DebugConfiguration> {
return new Promise<vscode.DebugConfiguration>(resolve => {
resolve(config);
@@ -58,4 +58,6 @@ export class DBConfigurationProvider implements
vscode.DebugConfigurationProvide
resolve(config);
});
}
-}
\ No newline at end of file
+}
+
+export const dBConfigurationProvider = new DBConfigurationProvider();
\ No newline at end of file
diff --git a/java/java.lsp.server/vscode/src/extension.ts
b/java/java.lsp.server/vscode/src/extension.ts
index 838f7b7833..a494f22dfb 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -56,7 +56,7 @@ import { asRanges, StatusMessageRequest,
ShowStatusMessageParams, QuickPickReque
import * as launchConfigurations from './launchConfigurations';
import { createTreeViewService, TreeViewService, TreeItemDecorator,
Visualizer, CustomizableTreeDataProvider } from './explorer';
import { initializeRunConfiguration, runConfigurationProvider,
runConfigurationNodeProvider, configureRunSettings, runConfigurationUpdateAll }
from './runConfiguration';
-import { DBConfigurationProvider } from './dbConfigurationProvider';
+import { dBConfigurationProvider } from './dbConfigurationProvider';
import { TLSSocket } from 'tls';
import { InputStep, MultiStepInput } from './utils';
import { env } from 'process';
@@ -427,7 +427,8 @@ export function activate(context: ExtensionContext):
VSNetBeansAPI {
// initialize Run Configuration
initializeRunConfiguration().then(initialized => {
if (initialized) {
-
context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('java+',
new DBConfigurationProvider()));
+
context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('java+',
dBConfigurationProvider));
+
context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('java',
dBConfigurationProvider));
context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('java+',
runConfigurationProvider));
context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('java',
runConfigurationProvider));
context.subscriptions.push(vscode.window.registerTreeDataProvider('run-config',
runConfigurationNodeProvider));
---------------------------------------------------------------------
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
