Use php-ts-mode

nanasess · Jan 7, 2024 · 14019bf · 14019bf
1 parent 0bafef8
commit 14019bf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/.emacs.d/el-get-init.d/init-php-ts-mode.el b/.emacs.d/el-get-init.d/init-php-ts-mode.el
@@ -0,0 +1,11 @@
+(add-to-list 'auto-mode-alist '("\\.\\(inc\\|php[s34]?\\)$" . php-ts-mode))
+(with-eval-after-load 'php-ts-mode
+  (with-eval-after-load 'lsp-bridge
+    (add-hook 'php-ts-mode-hook #'(lambda ()
+                                    (push '(php-ts-mode . lsp-bridge-php-lsp-server) lsp-bridge-single-lang-server-mode-list)
+                                    (lsp-bridge-mode 1))))
+  (add-hook 'php-mode-hook 'editorconfig-apply)
+  (electric-indent-local-mode t)
+  (electric-layout-mode t)
+  ;; (setq-local electric-layout-rules '((?{ . around)))
+  (electric-pair-local-mode t))
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
@@ -514,11 +514,16 @@
   :branch "eccube-engine")
 (el-get-bundle yaml-mode)
 
-(el-get-bundle php-mode
-  :type github
-  :pkgname "emacs-php/php-mode"
-  :build `(("make" ,(format "EMACS=%s" el-get-emacs)))
-  :load-path ("lisp"))
+;; (el-get-bundle php-mode
+;;   :type github
+;;   :pkgname "emacs-php/php-mode"
+;;   :build `(("make" ,(format "EMACS=%s" el-get-emacs)))
+;;   :load-path ("lisp"))
+(el-get-bundle php-ts-mode
+  :type github
+  :pkgname "emacs-php/php-ts-mode"
+  :branch "master"
+  :build `(("make" ,(format "EMACS=%s" el-get-emacs))))
 (el-get-bundle php-runtime
   :type github
   :pkgname "emacs-php/php-runtime.el")