refact: remove duplicate code from lsp4e.debug

eclipse · Aug 20, 2024 · d135a76 · d135a76
1 parent a651ebd
commit d135a76
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 202 deletions.
diff --git a/org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)",
  org.eclipse.jface.text,
  org.eclipse.ui.genericeditor,
- org.eclipse.core.variables
+ org.eclipse.core.variables,
+ org.eclipse.lsp4e;bundle-version="0.18.13"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.gson,

diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/breakpoints/DocumentUtils.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/breakpoints/DocumentUtils.java
diff --git a/...eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/breakpoints/TextSelectionToIVariable.java b/...eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/breakpoints/TextSelectionToIVariable.java
@@ -29,6 +29,7 @@
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextSelection;
+import org.eclipse.lsp4e.LSPEclipseUtils;
 import org.eclipse.lsp4e.debug.DSPPlugin;
 import org.eclipse.lsp4e.debug.debugmodel.DSPDebugTarget;
 import org.eclipse.lsp4e.debug.debugmodel.DSPStackFrame;
@@ -121,7 +122,7 @@ private boolean match(IDocument document, DSPStackFrame frame) {
  return false;
 
  if (sourceLocator.getSourceElement(frame) instanceof String sourceElement) {
- final var uri = DocumentUtils.toUri(document);
+ final var uri = LSPEclipseUtils.toUri(document);
  if (uri == null)
  return false;
  return Objects.equals(uri.getPath(), sourceElement);

diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/debugmodel/DSPDebugTarget.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/debugmodel/DSPDebugTarget.java
@@ -15,7 +15,7 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.debug.debugmodel;
 
-import static org.eclipse.lsp4e.debug.internal.NullSafetyHelper.*;
+import static org.eclipse.lsp4e.internal.NullSafetyHelper.*;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/debugmodel/TransportStreams.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/debugmodel/TransportStreams.java
@@ -8,7 +8,7 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.debug.debugmodel;
 
-import static org.eclipse.lsp4e.debug.internal.NullSafetyHelper.*;
+import static org.eclipse.lsp4e.internal.NullSafetyHelper.lateNonNull;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/internal/NullSafetyHelper.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/internal/NullSafetyHelper.java
diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/internal/package-info.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/internal/package-info.java
diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/launcher/DSPLaunchDelegate.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/launcher/DSPLaunchDelegate.java
@@ -8,7 +8,7 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.debug.launcher;
 
-import static org.eclipse.lsp4e.debug.internal.NullSafetyHelper.*;
+import static org.eclipse.lsp4e.internal.NullSafetyHelper.castNonNull;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/launcher/DSPMainTab.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/launcher/DSPMainTab.java
@@ -8,8 +8,8 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.debug.launcher;
 
-import static org.eclipse.lsp4e.debug.internal.NullSafetyHelper.*;
-import static org.eclipse.swt.events.SelectionListener.*;
+import static org.eclipse.lsp4e.internal.NullSafetyHelper.lateNonNull;
+import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/presentation/DAPWatchExpression.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/presentation/DAPWatchExpression.java
@@ -8,7 +8,7 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.debug.presentation;
 
-import static org.eclipse.lsp4e.debug.internal.NullSafetyHelper.*;
+import static org.eclipse.lsp4e.internal.NullSafetyHelper.castNonNull;
 
 import org.eclipse.core.runtime.Adapters;
 import org.eclipse.debug.core.DebugException;

diff --git a/org.eclipse.lsp4e.jdt/plugin.xml b/org.eclipse.lsp4e.jdt/plugin.xml
@@ -14,7 +14,7 @@
  requiresUIThread="false">
  </javaCompletionProposalComputer>
  </extension>
- 
+
  <extension
  id="ls-based-java-hover-provider"
  point="org.eclipse.jdt.ui.javaEditorTextHovers">
@@ -24,7 +24,7 @@
  id="org.eclipse.lsp4e.jdt.hoverprovider">
  </hover>
  </extension>
- 
+
  <extension
  point="org.eclipse.core.filebuffers.documentSetup">
  <participant

diff --git a/org.eclipse.lsp4e/META-INF/MANIFEST.MF b/org.eclipse.lsp4e/META-INF/MANIFEST.MF
@@ -47,10 +47,10 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.lsp4e.LanguageServerPlugin
-Export-Package: org.eclipse.lsp4e;x-internal:=true,
+Export-Package: org.eclipse.lsp4e;x-friends:="org.eclipse.lsp4e.debug,org.eclipse.lsp4e.jdt",
  org.eclipse.lsp4e.command;x-internal:=true,
  org.eclipse.lsp4e.format;x-internal:=true,
- org.eclipse.lsp4e.internal;x-friends:="org.eclipse.lsp4e.jdt",
+ org.eclipse.lsp4e.internal;x-friends:="org.eclipse.lsp4e.debug,org.eclipse.lsp4e.jdt",
  org.eclipse.lsp4e.operations.codeactions;x-internal:=true,
  org.eclipse.lsp4e.operations.completion;x-internal:=true,
  org.eclipse.lsp4e.operations.format;x-internal:=true,