From f0f243d3c850323c7f9d3acbe4c23d2aa2640121 Mon Sep 17 00:00:00 2001
From: Mickael Istria <mistria@redhat.com>
Date: Mon, 7 Feb 2022 17:51:39 +0100
Subject: [PATCH] [Debug] Abort adapter if variable cannot be found

This prevents some NPE
---
 org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF                   | 2 +-
 .../lsp4e/debug/breakpoints/TextSelectionToIVariable.java      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF
index 31cec6a66..c183f6bc9 100644
--- a/org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF
+++ b/org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Debug Adapter client for Eclipse IDE (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e.debug;singleton:=true
-Bundle-Version: 0.13.2.qualifier
+Bundle-Version: 0.13.3.qualifier
 Bundle-Activator: org.eclipse.lsp4e.debug.DSPPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/breakpoints/TextSelectionToIVariable.java b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/breakpoints/TextSelectionToIVariable.java
index 88b33998f..a77a18892 100644
--- a/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/breakpoints/TextSelectionToIVariable.java
+++ b/org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/breakpoints/TextSelectionToIVariable.java
@@ -58,6 +58,9 @@ private IVariable getVariableFor(TextSelection selection) {
 			if (variableName.isEmpty()) {
 				variableName = findVariableName(document, selection.getOffset());
 			}
+			if (variableName == null || variableName.isEmpty()) {
+				return null;
+			}
 
 			if (Boolean.TRUE.equals(frame.getDebugTarget().getCapabilities().getSupportsEvaluateForHovers())) {
 				try {