Use constants and eval on compile for completion keywords

This commit is contained in:
Nathan Lovato
2020-02-15 20:08:56 -06:00
parent 98274b4b52
commit 2909ff0c35
2 changed files with 7 additions and 6 deletions

View File

@@ -42,7 +42,8 @@
(let* ((bounds (bounds-of-thing-at-point 'symbol))
(start (car bounds))
(end (cdr bounds)))
(list start end gdscript--completion-keywords . nil)))
(list start end gdscript-completion--all-keywords
. nil)))
(provide 'gdscript-completion)

View File

@@ -33,14 +33,14 @@ highlighting."
(insert-file-contents (concat (file-name-directory (or load-file-name buffer-file-name)) file-path))
(split-string (buffer-string) "\n" t)))
(defvar gdscript-keywords (gdscript--get-package-file-content-as-string "data/keywords.txt"))
(defvar gdscript-built-in-constants (gdscript--get-package-file-content-as-string "data/built-in-constants.txt"))
(defconst gdscript-keywords (gdscript--get-package-file-content-as-string "data/keywords.txt"))
(defconst gdscript-built-in-constants (gdscript--get-package-file-content-as-string "data/built-in-constants.txt"))
;; Only contains types that are not classes and that the Godot editor highlights
;; like built-in keywords
(defvar gdscript-built-in-types (gdscript--get-package-file-content-as-string "data/built-in-types.txt"))
(defvar gdscript-built-in-functions (gdscript--get-package-file-content-as-string "data/built-in-functions.txt"))
(defconst gdscript-built-in-types (gdscript--get-package-file-content-as-string "data/built-in-types.txt"))
(defconst gdscript-built-in-functions (gdscript--get-package-file-content-as-string "data/built-in-functions.txt"))
;; Contains all engine classes and node types, including vectors, transforms, etc.
(defvar gdscript-built-in-classes (gdscript--get-package-file-content-as-string "data/built-in-classes.txt"))
(defconst gdscript-built-in-classes (gdscript--get-package-file-content-as-string "data/built-in-classes.txt"))
(defun regex-maker (words)
(regexp-opt words 'symbols))