refactor: initalization improvements

Author: iocanel

README.org

@@ -60,8 +60,7 @@ This will load all `el` files included in the project. Alternatively, you can tr
                                                             "idee-eshell.el"
                                                             "idee-vterm.el"
                                                             "idee-visitors.el"
-                                                            "idee-arch.el"
-                                                            "idee-yml.el"))
+                                                            "idee-arch.el"))
 #+end_src
 
     Using `use-package` you can enable additional modules in a similar mannner, for example:

idee-clojure.el

@@ -34,6 +34,8 @@
 
 (defconst clojure-comment-style (make-idee/comment-style :line-prefix ";;"))
 
+(defvar idee/clojure-initialized nil)
+
 (defun idee/clojure-enable()
   "Enable clojure bindings."
   (interactive)
@@ -77,8 +79,11 @@
     (idee/clojure-enable))) 
 
 (defun idee/clojure-init ()
-  (add-hook 'clojure-mode-hook 'idee/clojure-enable)
-  (idee/visitor-register 'idee/clojure-visitor))
+  "Initialize idee-clojure."
+  (interactive)
+    (idee/only-once idee/clojure-initialized
+      (add-hook 'clojure-mode-hook 'idee/clojure-enable)
+      (idee/visitor-register 'idee/clojure-visitor)))
 
 (provide 'idee-clojure)
 ;;; idee-clojure.el ends here

idee-golang.el

@@ -32,6 +32,8 @@
 (defconst glidee/yml "glide.yml")
 (defconst gopkg-toml "Gopkg.toml")
 
+(defvar idee/golang-initialized nil)
+
 (defun idee/golang-enable()
   "Enabled golang bindings."
   (interactive)
@@ -83,10 +85,11 @@ The command supports accepting an external CREATE-FUNCTION or defaults to idee/p
 (defun idee/golang-init ()
   "Initialize IDE golang."
   (interactive)
-  (idee/visitor-register 'idee/golang-visitor)
-  (idee/project-factory-register idee/golang-module-factory)
-  ;; Hooks
-  (add-hook 'go-mode-hook 'idee/golang-hook))
+    (idee/only-once idee/golang-initialized
+      (idee/visitor-register 'idee/golang-visitor)
+      (idee/project-factory-register idee/golang-module-factory)
+      ;; Hooks
+      (add-hook 'go-mode-hook 'idee/golang-hook))
 
 (provide 'idee-golang)
-;; idee-golang.el ends here
+;;; idee-golang.el ends here

idee-headers.el

@@ -28,7 +28,6 @@
 ;;
 ;; Customization
 ;;
-(defconst idee/emacs-headers-dir (concat (file-name-as-directory idee/resources-dir) "headers") "The directory where header files are stored.")
 
 (defvar idee/header-selected-kind nil "The kind of header currently selcted.")
 
@@ -92,10 +91,5 @@
   "Find the headers source directory."
   (concat (file-name-as-directory (idee/source-dir)) "headers"))
 
-;;;###autoload
-(defun idee/header-init ()
-  "Initialize ide headers."
-  (advice-add 'projectile-switch-project :after 'idee/header-detect))
-
 (provide 'idee-headers)
 ;;; idee-headers.el ends here

idee-java-utils.el

@@ -71,16 +71,19 @@
   "Return the package line for the current file."
   (idee/java-package-of default-directory))
 
+;;;###autoload
 (defun idee/java-package-line()
   "Return the full package line for the current directory."
   (let ((pkg (idee/java-package-of default-directory)))
     (when (and pkg (not (idee/string-blank pkg)))
         (concat "package " pkg ";"))))
 
+;;;###autoload
 (defun idee/java-class()
   "Return the class name for the current file."
   (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))
 
+;;;###autoload
 (defun idee/java-class-sans-suffix (suffix &optional class-name)
   "Return the class name for the current file."
   (let ((class-name (or class-name (file-name-nondirectory (file-name-sans-extension (buffer-file-name))))))

idee-java.el

@@ -47,6 +47,7 @@
 (defconst java-comment-style (make-idee/comment-style :block-beginning "/*" :block-ending "*/"
                                                       :custom-block-beginning idee/comment-java-custom-block-beginning :custom-line-prefix idee/comment-java-custom-line-prefix :custom-block-ending idee/comment-java-custom-block-ending))
 (defvar idee/java-last-visited-class nil)
+(defvar idee/java-initialized nil)
 
 
 (defun idee/java-enable()
@@ -76,7 +77,7 @@
          (jshell-process-name (format "*jshell %s" (if module-dir module-dir (idee/project-root-dir))))
          (existing-buffer (car (seq-filter  (lambda (b) (idee/starts-with (buffer-name b) jshell-process-name)) (buffer-list)))))
     (if existing-buffer
-          (switch-to-buffer existing-buffer)
+        (switch-to-buffer existing-buffer)
       (let* ((new-jshell-process-name (format "*%s*" jshell-buffer-name)))
         (ansi-term "/bin/sh" jshell-buffer-name)
         (term-line-mode)
@@ -98,33 +99,33 @@
   "Create a new java class with FQCN from the specified ARCHETYPE.
 The new class will be created under SRC-PATH or `src/main/java` if the src path is ommitted.
 The target module will be the current, unless BASE-PATH has been specified, in which case it will be used."
-    (with-temp-buffer
-      (let* ((base-path (file-name-as-directory (or base-path (idee/module-root-dir))))
-             (src-path (file-name-as-directory (or src-path "src/main/java")))
-             (package (idee/java-package-of-fqcn fqcn))
-             (class-name (substring fqcn (+ 1 (length package))))
-             (package-path (replace-regexp-in-string (regexp-quote ".") "/" package))
-             (class (concat base-path (format "%s/%s/%s.java" src-path package-path class-name))))
-        (set-visited-file-name class)
-        (insert archetype)
-        (java-mode)
-        (yas-expand)
-        (write-file class))))
+  (with-temp-buffer
+    (let* ((base-path (file-name-as-directory (or base-path (idee/module-root-dir))))
+           (src-path (file-name-as-directory (or src-path "src/main/java")))
+           (package (idee/java-package-of-fqcn fqcn))
+           (class-name (substring fqcn (+ 1 (length package))))
+           (package-path (replace-regexp-in-string (regexp-quote ".") "/" package))
+           (class (concat base-path (format "%s/%s/%s.java" src-path package-path class-name))))
+      (set-visited-file-name class)
+      (insert archetype)
+      (java-mode)
+      (yas-expand)
+      (write-file class))))
 
 (defun idee/java-archetype-create-resource (name archetype &optional src-path base-path)
   "Create a new java class with FQCN in the current module from the specified ARCHETYPE."
-    (with-temp-buffer
-      (let* ((base-path (file-name-as-directory (or base-path (idee/module-root-dir))))
-             (src-path (file-name-as-directory (or src-path "src/main/resources")))
-             (resource (concat base-path (format "%s/%s" src-path name)))
-             (extension (file-name-extension resource))
-             (mode (cdr (assoc extension idee/type-modes-alist))))
-        (set-visited-file-name resource)
-        (when archetype
-          (insert archetype)
-          (when mode (funcall mode))
-          (yas-expand))
-        (write-file resource))))
+  (with-temp-buffer
+    (let* ((base-path (file-name-as-directory (or base-path (idee/module-root-dir))))
+           (src-path (file-name-as-directory (or src-path "src/main/resources")))
+           (resource (concat base-path (format "%s/%s" src-path name)))
+           (extension (file-name-extension resource))
+           (mode (cdr (assoc extension idee/type-modes-alist))))
+      (set-visited-file-name resource)
+      (when archetype
+        (insert archetype)
+        (when mode (funcall mode))
+        (yas-expand))
+      (write-file resource))))
 
 (defun idee/java-register-spi (interface impl)
   "Create a new java class with FQCN in the current module from the specified ARCHETYPE."
@@ -147,54 +148,54 @@ The target module will be the current, unless BASE-PATH has been specified, in w
     (idee/java-archetype-create-class fqcn "abstract-factory")))
 
 (defun idee/java-archetype-annotation-processor ()
-       "A simple java annotation and annotation processor archetype."
-       (interactive)
-       (let* ((current-fqcn (idee/java-fqcn-of (buffer-file-name)))
-              (current-pkg (idee/java-package-of (buffer-file-name)))
-              (fqcn (read-string "Annotation processor qualified class name:" current-pkg)))
-         (idee/java-archetype-create-class fqcn "annotation")
-         (idee/java-archetype-create-class (concat fqcn "Processor") "apt")
-         (idee/java-register-spi "javax.annotation.processing.Processor" fqcn)))
+  "A simple java annotation and annotation processor archetype."
+  (interactive)
+  (let* ((current-fqcn (idee/java-fqcn-of (buffer-file-name)))
+         (current-pkg (idee/java-package-of (buffer-file-name)))
+         (fqcn (read-string "Annotation processor qualified class name:" current-pkg)))
+    (idee/java-archetype-create-class fqcn "annotation")
+    (idee/java-archetype-create-class (concat fqcn "Processor") "apt")
+    (idee/java-register-spi "javax.annotation.processing.Processor" fqcn)))
 
 ;;
 ;; Snippets
 ;;
 
 (defun idee/java-create-template (source-file name key &optional templates-dir)
   "Create snippet from file."
-    (with-temp-buffer
-      (let* ((root-dir (idee/project-root-dir (buffer-file-name)))
-             (conf-dir (concat (file-name-as-directory root-dir) idee/project-conf-dir))
-             (project-templates-dir (concat (file-name-as-directory conf-dir) "templates"))
-             (templates-dir (or templates-dir project-templates-dir))
-             (body (idee/java-snippet-body-from source-file))
-             (target (concat (file-name-as-directory templates-dir) (format "java-mode/%s" key)))
-             (parent (file-name-directory target)))
-        (set-visited-file-name target)
-        (insert (format "# name: %s" name))
-        (newline)
-        (insert (format "# key: %s" key))
-        (newline)
-        (insert "# --")
-        (newline)
-        (insert body)
-        (write-file target)
-        (yas-load-directory parent)
-        (yas-compile-directory parent))))
+  (with-temp-buffer
+    (let* ((root-dir (idee/project-root-dir (buffer-file-name)))
+           (conf-dir (concat (file-name-as-directory root-dir) idee/project-conf-dir))
+           (project-templates-dir (concat (file-name-as-directory conf-dir) "templates"))
+           (templates-dir (or templates-dir project-templates-dir))
+           (body (idee/java-snippet-body-from source-file))
+           (target (concat (file-name-as-directory templates-dir) (format "java-mode/%s" key)))
+           (parent (file-name-directory target)))
+      (set-visited-file-name target)
+      (insert (format "# name: %s" name))
+      (newline)
+      (insert (format "# key: %s" key))
+      (newline)
+      (insert "# --")
+      (newline)
+      (insert body)
+      (write-file target)
+      (yas-load-directory parent)
+      (yas-compile-directory parent))))
 
 (defun idee/java-snippet-body-from (f)
   "Create snippet from file F."
   (with-temp-buffer
     (save-excursion
-        (insert-file-contents f)
-        (goto-char (point-min))
-        (idee/comment-remove-at-point java-comment-style)
-        (let* ((content (buffer-substring-no-properties (point-min) (point-max)))
-               (class-name (idee/java-class-name-of f))
-               (updated (concat
-                         "`idee/header`\n" (replace-regexp-in-string "package[ ]+[a-zA-Z0-9\.-]+;" "`idee/java-package-line`"
+      (insert-file-contents f)
+      (goto-char (point-min))
+      (idee/comment-remove-at-point java-comment-style)
+      (let* ((content (buffer-substring-no-properties (point-min) (point-max)))
+             (class-name (idee/java-class-name-of f))
+             (updated (concat
+                       "`idee/header`\n" (replace-regexp-in-string "package[ ]+[a-zA-Z0-9\.-]+;" "`idee/java-package-line`"
                                                                    (replace-regexp-in-string (regexp-quote class-name) idee/java-snippet-class-name content t) t))))
-          updated))))
+        updated))))
 
 (defun idee/filename ()
   "Return the name for the current file."
@@ -208,44 +209,62 @@ The target module will be the current, unless BASE-PATH has been specified, in w
                     (equal build-gradle x)))
               (directory-files root)))
 
+;;;###autoload
 (defun idee/java-visitor (root)
   "Check if a java project is available under the specified ROOT."
-  (if (idee/java-project-p root)
-      (idee/java-enable)))
+  (when (idee/java-project-p root)
+    (idee/lsp-java-init)
+    (idee/java-enable)))
 
 ;;;###autoload
 (defun idee/java-init ()
   "Initialize java."
   (interactive)
   ;; Dependencies
-  (idee/lsp-java-init)
-  (idee/maven-init)
-  (idee/quarkus-init)
-  (idee/spring-init)
-
-  (idee/visitor-register 'idee/java-visitor)
-
-  (idee/template-factory-register (make-idee/template-factory
-                                             :mode 'java-mode
-                                             :description "A java temlate factory"
-                                             :func 'idee/java-create-template))
- (idee/archetype-register
-   (make-idee/archetype
-    :name "Java Abstract Factory"
-    :description "A simple java abstract factory"
-    :func 'idee/java-archetype-abstract-factory))
-
- (idee/archetype-register
-  (make-idee/archetype
-   :name "Java Annotation and Processor"
-   :description "A java annotation and a java annotation processor"
-   :func 'idee/java-archetype-annotation-processor))
+  (idee/only-once idee/java-initialized
+    ;; LSP
+    (idee/lsp-java-init)
+
+    ;; Maven
+    (idee/visitor-register 'idee/maven-visitor)
+    (idee/project-factory-register (make-idee/project-factory
+                                    :name "Maven"
+                                    :description "New Maven project from archetype."
+                                    :func 'idee/new-maven-from-archetype-project))
+    ;; Quarkus
+    (idee/visitor-register 'idee/quarkus-visitor)
+    (idee/project-factory-register (make-idee/project-factory
+                                    :name "Quarkus"
+                                    :description "New Quarkus project created using the quarkus maven plugin."
+                                    :func 'idee/new-quarkus-rest-project))
+
+    ;; Spring
+    (idee/project-factory-register (make-idee/project-factory
+                                    :name "Spring"
+                                    :description "New Spring project created using https://start.spring.io"
+                                    :func 'idee/new-spring-starter-project))
+
+    (idee/template-factory-register (make-idee/template-factory
+                                     :mode 'java-mode
+                                     :description "A java temlate factory"
+                                     :func 'idee/java-create-template))
+    (idee/archetype-register
+     (make-idee/archetype
+      :name "Java Abstract Factory"
+      :description "A simple java abstract factory"
+      :func 'idee/java-archetype-abstract-factory))
+
+    (idee/archetype-register
+     (make-idee/archetype
+      :name "Java Annotation and Processor"
+      :description "A java annotation and a java annotation processor"
+      :func 'idee/java-archetype-annotation-processor))
 
   ;;; Hook
-  (add-hook 'java-mode-hook 'idee/java-enable)
-  (add-hook 'java-mode-hook 'idee/java-visit-file)
+    (add-hook 'java-mode-hook 'idee/java-enable)
+    (add-hook 'java-mode-hook 'idee/java-visit-file)
 
-  (advice-add 'projectile-switch-to-buffer :after #'idee/java-visit-file))
+    (advice-add 'projectile-switch-to-buffer :after #'idee/java-visit-file))))
 
 (provide 'idee-java)
 ;;; idee-java.el ends here

idee-javascript.el

@@ -33,6 +33,8 @@
 (defconst jsconfig-json "jsconfig.json")
 (defconst tsconfig-json "tsconfig.json")
 
+(defvar idee/javascript-initialized nil)
+
 (defun idee/javascript-enable()
   "Enable javascript, add hooks, visitors etc."
   (interactive))
@@ -202,19 +204,20 @@ The command supports accepting an external CREATE-FUNCTION or defaults to idee/p
 (defun idee/javascript-init ()
   "Initialize IDE javascript."
   (interactive)
-  (idee/project-factory-register idee/npm-project-factory)
-  (idee/visitor-register 'idee/javascript-visitor)
+  (idee/only-once idee/javascript-initialized
+    (idee/project-factory-register idee/npm-project-factory)
+    (idee/visitor-register 'idee/javascript-visitor)
 
-  (idee/template-factory-register (make-idee/template-factory
+    (idee/template-factory-register (make-idee/template-factory
                                              :mode 'js-mode
                                              :description "A javascript temlate factory"
                                              :func 'idee/javascript-create-template))
 
-;; Hooks
-  (add-hook 'javascipt-mode-hook 'idee/javascript-hook)
-  (add-hook 'js2-mode-hook 'idee/javascript-hook)
-  (add-hook 'js-jsx-mode-hook 'idee/javascript-hook)
-  (add-hook 'typescirpt-mode-hook 'idee/javascript-hook))
+    ;; Hooks
+    (add-hook 'javascipt-mode-hook 'idee/javascript-hook)
+    (add-hook 'js2-mode-hook 'idee/javascript-hook)
+    (add-hook 'js-jsx-mode-hook 'idee/javascript-hook)
+    (add-hook 'typescirpt-mode-hook 'idee/javascript-hook)))
 
 (provide 'idee-javascript)
 ;;; idee-javascript.el ends here