[sql-hint addon] Fix retrieving of parser config

codemirror · Nov 15, 2022 · 742627a · 742627a
1 parent 407d1f1
commit 742627a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
@@ -23,14 +23,16 @@
 
   function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
 
+  function getModeConf(editor) {
+    return editor.getModeAt(editor.getCursor()).config || CodeMirror.resolveMode("text/x-sql")
+  }
+
   function getKeywords(editor) {
-    return editor.getModeAt(editor.getCursor()).keywords || CodeMirror.resolveMode("text/x-sql").keywords;
+    return getModeConf(editor).keywords || []
   }
 
   function getIdentifierQuote(editor) {
-    return editor.getModeAt(editor.getCursor()).identifierQuote ||
-      CodeMirror.resolveMode("text/x-sql").identifierQuote ||
-      "`";
+    return getModeConf(editor).identifierQuote || "`";
   }
 
   function getText(item) {

diff --git a/mode/sql/sql.js b/mode/sql/sql.js