refactor: use BETWEEN operator (#173)

elixir-tools · Aug 13, 2023 · 6098bad · 6098bad
1 parent 4362d66
commit 6098bad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lib/next_ls.ex b/lib/next_ls.ex
@@ -672,8 +672,8 @@ defmodule NextLS do
     SELECT identifier, type, module
     FROM "references" refs
     WHERE refs.file = ?
-      AND refs.start_line <= ? AND refs.end_line >= ?
-      AND refs.start_column <= ? AND refs.end_column >= ?
+      AND ? BETWEEN refs.start_line AND refs.end_line
+      AND ? BETWEEN refs.start_column AND refs.end_column
     ORDER BY refs.id ASC
     LIMIT 1
     """
@@ -695,7 +695,7 @@ defmodule NextLS do
         {:function, module, function}
 
       _unknown_definition ->
-        case DB.query(database, reference_query, [file, line, line, col, col]) do
+        case DB.query(database, reference_query, [file, line, col]) do
           [[function, "function", module]] ->
             {:function, module, function}
 

diff --git a/lib/next_ls/definition.ex b/lib/next_ls/definition.ex
@@ -15,14 +15,12 @@ defmodule NextLS.Definition do
                  'references' AS refs
              WHERE
                  refs.file = ?
-                 AND refs.start_line <= ?
-                 AND ? <= refs.end_line
-                 AND refs.start_column <= ?
-                 AND ? <= refs.end_column
+                 AND ? BETWEEN refs.start_line AND refs.end_line
+                 AND ? BETWEEN refs.start_column AND refs.end_column
              ORDER BY refs.id asc
              LIMIT 1;
              """,
-             [file, line, line, col, col]
+             [file, line, col]
            ) do
       query =
         ~Q"""