Skip to content

Commit

Permalink
Merge pull request #310 from nanasess/use-php-ts-mode
Browse files Browse the repository at this point in the history
Use php-ts-mode
  • Loading branch information
nanasess authored Jan 13, 2024
2 parents 62d61d5 + 14019bf commit c194cce
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
11 changes: 11 additions & 0 deletions .emacs.d/el-get-init.d/init-php-ts-mode.el
Original file line number Diff line number Diff line change
@@ -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))
15 changes: 10 additions & 5 deletions .emacs.d/init.el
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit c194cce

Please sign in to comment.