Completion, resolve minor fix. Path searching was verified.

Resolves: #426
JetBrains-Research · Dec 2, 2021 · 9bf5945 · 9bf5945
1 parent 42d6a40
commit 9bf5945
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/main/kotlin/com/jetbrains/snakecharm/lang/psi/SmkFileReference.kt b/src/main/kotlin/com/jetbrains/snakecharm/lang/psi/SmkFileReference.kt
@@ -263,7 +263,7 @@ class SmkNotebookReference(
 ) : SmkFileReference(element, textRange, stringLiteralExpression, path) {
     override fun getVariants() = collectFileSystemItemLike {
         val name = it.name.lowercase()
-        name.endsWith(".py.ipynb") or name.endsWith(".r.ipynb")
+        name.endsWith(".py.ipynb") or name.endsWith(".r.ipynb") or name.endsWith(".ipynb")
     }
 }
 

diff --git a/src/test/resources/features/completion/path_in_section_completion.feature b/src/test/resources/features/completion/path_in_section_completion.feature
@@ -23,6 +23,7 @@ Feature: Complete file name in conda section
       | rule       | conda     | xoo.yml               |
       | rule       | notebook  | xoo.py.ipynb          |
       | rule       | notebook  | xoo.r.ipynb           |
+      | rule       | notebook  | xoo.ipynb             |
       | module     | snakefile | xoo.smk               |
       | module     | snakefile | other/files/foo.smk   |
       | module     | snakefile | other/files/Snakefile |
@@ -74,6 +75,7 @@ Feature: Complete file name in conda section
       | rule       | conda    | yaml     |
       | checkpoint | conda    | yaml     |
       | rule       | notebook | py.ipynb |
+      | rule       | notebook | ipynb        |
       | rule       | script   | py       |
       | rule       | script   | r        |
       | rule       | script   | rmd      |
@@ -161,7 +163,7 @@ Feature: Complete file name in conda section
       | checkpoint | conda    | envs/roo.yaml          | ../envs/roo.yaml          | yaml     |
       | rule       | notebook | roo.py.ipynb           | ../roo.py.ipynb           | py.ipynb |
       | rule       | notebook | notebooks/roo.py.ipynb | ../notebooks/roo.py.ipynb | py.ipynb |
-      | rule       | notebook | rules/roo.py.ipynb     | roo.py.ipynb              | py.ipynb |
+      | rule       | notebook | rules/roo.ipynb        | roo.ipynb                 | ipynb    |
       | rule       | script   | roo.py                 | ../roo.py                 | py       |
       | rule       | script   | scripts/roo.py         | ../scripts/roo.py         | py       |
       | rule       | script   | rules/roo.py           | roo.py                    | py       |
diff --git a/src/test/resources/features/resolve/path_in_section_resolve.feature b/src/test/resources/features/resolve/path_in_section_resolve.feature
@@ -20,7 +20,7 @@ Feature: Resolve file in conda/notebook sections
       | rule       | conda    | yml      |
       | rule       | notebook | py.ipynb |
       | rule       | notebook | r.ipynb  |
-      | checkpoint | notebook | py.ipynb |
+      | checkpoint | notebook | ipynb    |
       | rule       | script   | py       |
       | rule       | script   | r        |
       | rule       | script   | rmd      |
@@ -45,7 +45,7 @@ Feature: Resolve file in conda/notebook sections
       | checkpoint | conda    | yaml     |
       | rule       | notebook | py.ipynb |
       | rule       | notebook | r.ipynb  |
-      | checkpoint | notebook | py.ipynb |
+      | checkpoint | notebook | ipynb    |
       | rule       | script   | py       |
       | rule       | script   | r        |
       | rule       | script   | rmd      |
@@ -71,7 +71,7 @@ Feature: Resolve file in conda/notebook sections
       | checkpoint | conda    | yaml     |
       | rule       | notebook | py.ipynb |
       | rule       | notebook | r.ipynb  |
-      | checkpoint | notebook | py.ipynb |
+      | checkpoint | notebook | ipynb    |
       | rule       | script   | py       |
       | rule       | script   | r        |
       | rule       | script   | rmd      |
@@ -98,7 +98,7 @@ Feature: Resolve file in conda/notebook sections
       | """   | conda    | yaml     |
       | '     | notebook | py.ipynb |
       | "     | notebook | py.ipynb |
-      | """   | notebook | py.ipynb |
+      | """   | notebook | ipynb    |
       | '     | script   | py       |
       | "     | script   | py       |
       | """   | script   | py       |
@@ -123,7 +123,7 @@ Feature: Resolve file in conda/notebook sections
       | """   | conda    | yaml     |
       | '     | notebook | py.ipynb |
       | "     | notebook | py.ipynb |
-      | """   | notebook | py.ipynb |
+      | """   | notebook | ipynb    |
       | '     | script   | py       |
       | "     | script   | py       |
       | """   | script   | py       |
@@ -225,6 +225,6 @@ Feature: Resolve file in conda/notebook sections
       | checkpoint | conda    | envs/roo.yaml          | ../envs/roo.yaml          |
       | rule       | notebook | roo.py.ipynb           | ../roo.py.ipynb           |
       | rule       | notebook | notebooks/roo.py.ipynb | ../notebooks/roo.py.ipynb |
-      | rule       | notebook | rules/roo.py.ipynb     | roo.py.ipynb              |
+      | rule       | notebook | rules/roo.ipynb        | roo.ipynb                 |
       | rule       | script   | scripts/roo.py         | ../scripts/roo.py         |
       | rule       | script   | scripts/roo.r          | ../scripts/roo.r          |