emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3810 from samwdp/develop

Browse source 
Add +powershell to lang/sh module
This commit is contained in:
Henrik Lissner 2020-10-08 13:56:59 -04:00 • committed by GitHub
commit c2704dc6e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/modules.org
View file

@ -142,7 +142,7 @@ Modules that bring support for a language or group of languages to Emacs.
+ [[file:../modules/lang/rust/README.org][rust]] =+lsp= - TODO + [[file:../modules/lang/rust/README.org][rust]] =+lsp= - TODO
+ scala =+lsp= - TODO + scala =+lsp= - TODO
+ [[file:../modules/lang/scheme/README.org][scheme]] - TODO + [[file:../modules/lang/scheme/README.org][scheme]] - TODO
+ [[file:../modules/lang/sh/README.org][sh]] =+fish +lsp= - TODO + [[file:../modules/lang/sh/README.org][sh]] =+fish +lsp +powershell= - TODO
+ [[file:../modules/lang/sml/README.org][sml]] - TODO + [[file:../modules/lang/sml/README.org][sml]] - TODO
+ [[file:../modules/lang/solidity/README.org][solidity]] - TODO + [[file:../modules/lang/solidity/README.org][solidity]] - TODO
+ swift =+lsp= - TODO + swift =+lsp= - TODO

2
modules/lang/sh/README.org
View file

@ -23,10 +23,12 @@ This module adds support for shell scripting languages.
+ =+lsp= Enables LSP support for sh-mode. This requires the =:tools lsp= module + =+lsp= Enables LSP support for sh-mode. This requires the =:tools lsp= module
to be enabled and [[https://github.com/mads-hartmann/bash-language-server][bash-language-server]] to be installed on your system. to be enabled and [[https://github.com/mads-hartmann/bash-language-server][bash-language-server]] to be installed on your system.
+ =+fish= Add syntax highlighting for fish script files. + =+fish= Add syntax highlighting for fish script files.
+ =+powershell= Add syntax highlighting for Powershell script files .ps1 and .psm1
** Plugins ** Plugins
+ [[https://github.com/Alexander-Miller/company-shell][company-shell]]* (=:completion company=) + [[https://github.com/Alexander-Miller/company-shell][company-shell]]* (=:completion company=)
+ [[https://github.com/wwwjfy/emacs-fish][fish-mode]]* (=+fish=) + [[https://github.com/wwwjfy/emacs-fish][fish-mode]]* (=+fish=)
+ [[https://github.com/jschaf/powershell.el][powershell-mode]]* (=+powershell=)
** Hacks ** Hacks
+ Interpolated variables are fontified. + Interpolated variables are fontified.

9
modules/lang/sh/config.el
View file

@ -65,7 +65,6 @@
;; autoclose backticks ;; autoclose backticks
(sp-local-pair 'sh-mode "`" "`" :unless '(sp-point-before-word-p sp-point-before-same-p))) (sp-local-pair 'sh-mode "`" "`" :unless '(sp-point-before-word-p sp-point-before-same-p)))
(use-package! company-shell (use-package! company-shell
:when (featurep! :completion company) :when (featurep! :completion company)
:unless (featurep! +lsp) :unless (featurep! +lsp)
@ -74,8 +73,14 @@
(set-company-backend! 'sh-mode '(company-shell company-files)) (set-company-backend! 'sh-mode '(company-shell company-files))
(setq company-shell-delete-duplicates t)) (setq company-shell-delete-duplicates t))
(use-package! fish-mode (use-package! fish-mode
:when (featurep! +fish) :when (featurep! +fish)
:defer t :defer t
:config (set-formatter! 'fish-mode #'fish_indent)) :config (set-formatter! 'fish-mode #'fish_indent))
(use-package! powershell
:when (featurep! +powershell)
:defer t
:config
(when (featurep! +lsp)
(add-hook 'powershell-mode-local-vars-hook #'lsp!)))

3
modules/lang/sh/packages.el
View file

@ -6,3 +6,6 @@
(when (featurep! +fish) (when (featurep! +fish)
(package! fish-mode :pin "db257db81058b0b12f788c324c264cc59b9a5bf4")) (package! fish-mode :pin "db257db81058b0b12f788c324c264cc59b9a5bf4"))
(when (featurep! +powershell)
(package! powershell :pin "87826777bd3ebd53740be99b4546bfc11ccc625d"))