#2894 final fix

Camelcade · Sep 15, 2024 · c9257b6 · c9257b6
1 parent 29f0e1f
commit c9257b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...in/core/src/main/java/com/perl5/lang/perl/idea/intellilang/PerlHeredocLiteralEscaper.java b/...in/core/src/main/java/com/perl5/lang/perl/idea/intellilang/PerlHeredocLiteralEscaper.java
@@ -36,7 +36,7 @@ public boolean isOneLine() {
   @Override
   public boolean decode(@NotNull TextRange rangeInsideHost, @NotNull StringBuilder outChars) {
     var hostTextLength = myHost.getTextLength();
-    var effectiveRange = hostTextLength < rangeInsideHost.getEndOffset() ?
+    var effectiveRange = rangeInsideHost.getEndOffset() < hostTextLength ?
       rangeInsideHost :
       TextRange.create(rangeInsideHost.getStartOffset(), rangeInsideHost.getEndOffset() - 1);
     if (!effectiveRange.isEmpty()) {

diff --git a/plugin/src/testFixtures/java/base/PerlLightTestCaseBase.java b/plugin/src/testFixtures/java/base/PerlLightTestCaseBase.java
@@ -1377,8 +1377,14 @@ protected <T extends PsiElement> T getElementAtCaretWithoutInjection(@NotNull Cl
   }
 
   protected @NotNull PsiElement getElementAtCaretWithoutInjection() {
-    PsiElement result = getFile().getViewProvider().findElementAt(getEditor().getCaretModel().getOffset());
-    assertNotNull(result);
+    PsiElement result;
+    if (getFile().getText().isEmpty()) {
+      result = getFile();
+    }
+    else {
+      result = getFile().getViewProvider().findElementAt(getEditor().getCaretModel().getOffset());
+      assertNotNull(result);
+    }
     PsiFile leafFile = result.getContainingFile();
     if (InjectedLanguageManager.getInstance(getProject()).isInjectedFragment(leafFile)) {
       result = leafFile.getContext();