configs/init-eglot.el

@@ -31,15 +31,15 @@
 
 (use-package eglot
   :defer t
-  :ensure nil
+  ;; :ensure nil
   :hook ((css-mode  . eglot-ensure)
          (html-mode . eglot-ensure)
-         (php-ts-mode . eglot-ensure)
+         (php-mode  . eglot-ensure)
          (rust-mode . eglot-ensure)
          (sh-mode   . eglot-ensure))
   :config
   (setq eglot-sync-connect 0)
-  (add-to-list 'eglot-server-programs '(php-ts-mode . ("intelephense" "--stdio")))
+  (add-to-list 'eglot-server-programs '(php-mode . ("intelephense" "--stdio")))
 )
 
 ;; Mejorar la velocidad de eglot (un binario en rust )

configs/init-evil.el

@@ -88,7 +88,7 @@
   ;; Cambios de modos
   (evil-define-key 'normal 'global (kbd "<leader>mh") 'html-mode)
   (evil-define-key 'normal 'global (kbd "<leader>mj") 'js-mode)
-  (evil-define-key 'normal 'global (kbd "<leader>mp") 'php-ts-mode)
+  (evil-define-key 'normal 'global (kbd "<leader>mp") 'php-mode)
   (evil-define-key 'normal 'global (kbd "<leader>mr") 'rust-mode)
   (evil-define-key 'normal 'global (kbd "<leader>mw") 'web-mode)
 

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-ts-mode)
+(global-set-key (kbd "C-x mp") 'php-mode)
 (global-set-key (kbd "C-x mr") 'rust-mode)
 (global-set-key (kbd "C-x mw") 'web-mode)
 

configs/init-packages.el

@@ -201,7 +201,6 @@
           (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)
@@ -444,6 +443,13 @@
 	(message "`%s' parser was installed." lang)
 	(sit-for 0.75)))))
 
+;; Cuando presionas enter en un bloque de comentario sigue el estilo del bloque.
+;; (use-package vs-comment-return
+;;   :ensure (:host github :repo "emacs-vs/vs-comment-return")
+;;   :defer t
+;;   :hook (prog-mode . vs-comment-return-mode)
+;;   )
+
 ;; Mostrar el último commit que modificó la linea actual
 (use-package vc-msg
   :defer t

configs/lang-php.el

@@ -9,14 +9,25 @@
 
 ;;; Code:
 
-(use-package php-ts-mode
+(use-package php-mode
   :defer t
-  :mode "\\.php\\'"
-  :ensure nil)
+  :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)
+      )
+    )
+  )
 
 (use-package php-doc-block
-  :after php-ts-mode
-  :bind ("C-c d b" . php-doc-block)
+  :after php-mode
   :ensure (:host github :repo "moskalyovd/emacs-php-doc-block")
   )