diff --git a/configs/init-eglot.el b/configs/init-eglot.el index bdbd8b2..7deec0a 100644 --- a/configs/init-eglot.el +++ b/configs/init-eglot.el @@ -31,15 +31,15 @@ (use-package eglot :defer t - ;; :ensure nil - :hook ((css-mode . eglot-ensure) - (html-mode . eglot-ensure) - (php-mode . eglot-ensure) - (rust-mode . eglot-ensure) - (sh-mode . eglot-ensure)) + :ensure nil + :hook ((css-mode . eglot-ensure) + (html-mode . eglot-ensure) + (php-ts-mode . eglot-ensure) + (rust-mode . eglot-ensure) + (sh-mode . eglot-ensure)) :config (setq eglot-sync-connect 0) - (add-to-list 'eglot-server-programs '(php-mode . ("intelephense" "--stdio"))) + (add-to-list 'eglot-server-programs '(php-ts-mode . ("intelephense" "--stdio"))) ) ;; Mejorar la velocidad de eglot (un binario en rust ) diff --git a/configs/init-evil.el b/configs/init-evil.el index 1fd26d3..fbd7bf8 100644 --- a/configs/init-evil.el +++ b/configs/init-evil.el @@ -88,7 +88,7 @@ ;; Cambios de modos (evil-define-key 'normal 'global (kbd "mh") 'html-mode) (evil-define-key 'normal 'global (kbd "mj") 'js-mode) - (evil-define-key 'normal 'global (kbd "mp") 'php-mode) + (evil-define-key 'normal 'global (kbd "mp") 'php-ts-mode) (evil-define-key 'normal 'global (kbd "mr") 'rust-mode) (evil-define-key 'normal 'global (kbd "mw") 'web-mode) diff --git a/configs/init-keys.el b/configs/init-keys.el index d142e67..c1d919f 100644 --- a/configs/init-keys.el +++ b/configs/init-keys.el @@ -27,7 +27,7 @@ (global-set-key (kbd "C-x m") nil) ; Unbind mail on C-x m (global-set-key (kbd "C-x mh") 'mhtml-mode) (global-set-key (kbd "C-x mj") 'js-mode) -(global-set-key (kbd "C-x mp") 'php-mode) +(global-set-key (kbd "C-x mp") 'php-ts-mode) (global-set-key (kbd "C-x mr") 'rust-mode) (global-set-key (kbd "C-x mw") 'web-mode) diff --git a/configs/init-packages.el b/configs/init-packages.el index f65444c..2e1b156 100644 --- a/configs/init-packages.el +++ b/configs/init-packages.el @@ -201,6 +201,7 @@ (objc-mode . ,hes-c/c++/objc-escape-sequence-re) (go-mode . ,hes-c/c++/objc-escape-sequence-re) (php-mode . ,hes-c/c++/objc-escape-sequence-re) + (php-ts-mode . ,hes-c/c++/objc-escape-sequence-re) (java-mode . ,hes-java-escape-sequence-re) (clojure-mode . ,hes-java-escape-sequence-re) (js-mode . ,hes-js-escape-sequence-re) diff --git a/configs/lang-php.el b/configs/lang-php.el index a3016c2..5212153 100644 --- a/configs/lang-php.el +++ b/configs/lang-php.el @@ -9,25 +9,14 @@ ;;; Code: -(use-package php-mode +(use-package php-ts-mode :defer t - :bind ("C-c d b" . kj/php-doc-block) - :config - (defun kj/php-doc-block () - "Llama a \"php-dock-block\", sin conflicto con \"vs-comment-return-mode\"." - (interactive) - (if (bound-and-true-p vs-comment-return-mode) - (funcall (lambda() - (vs-comment-return-mode -1) - (php-doc-block) - (vs-comment-return-mode 1))) - (php-doc-block) - ) - ) - ) + :mode "\\.php\\'" + :ensure nil) (use-package php-doc-block - :after php-mode + :after php-ts-mode + :bind ("C-c d b" . php-doc-block) :ensure (:host github :repo "moskalyovd/emacs-php-doc-block") )