[sql-hint addon] Fix getting keywords from plain sql mode

marijnh · marijnh · commit fbe612a66ab2 · 2022-12-08T08:35:48.000+01:00
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
@@ -23,16 +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 getModeConf(editor, field) {
+    return editor.getModeAt(editor.getCursor()).config[field] || CodeMirror.resolveMode("text/x-sql")[field]
   }
 
   function getKeywords(editor) {
-    return getModeConf(editor).keywords || []
+    return getModeConf(editor, "keywords") || []
   }
 
   function getIdentifierQuote(editor) {
-    return getModeConf(editor).identifierQuote || "`";
+    return getModeConf(editor, "identifierQuote") || "`";
   }
 
   function getText(item) {

Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,16 @@`
`23`	`23`
`24`	`24`	`function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }`
`25`	`25`
`26`		`- function getModeConf(editor) {`
`27`		`- return editor.getModeAt(editor.getCursor()).config \|\| CodeMirror.resolveMode("text/x-sql")`
	`26`	`+ function getModeConf(editor, field) {`
	`27`	`+ return editor.getModeAt(editor.getCursor()).config[field] \|\| CodeMirror.resolveMode("text/x-sql")[field]`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`function getKeywords(editor) {`
`31`		`- return getModeConf(editor).keywords \|\| []`
	`31`	`+ return getModeConf(editor, "keywords") \|\| []`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`function getIdentifierQuote(editor) {`
`35`		- return getModeConf(editor).identifierQuote \|\| "`";
	`35`	+ return getModeConf(editor, "identifierQuote") \|\| "`";
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`function getText(item) {`