From e780e6711260e51787475d91d81c99bc0e2b1649 Mon Sep 17 00:00:00 2001 From: Wang Shidong Date: Mon, 12 Apr 2021 23:36:43 +0800 Subject: [PATCH] Fix lang#html layer (#4202) --- autoload/SpaceVim/layers/lang/html.vim | 13 ++++++++++++- docs/cn/layers/lang/html.md | 11 +++++++++++ docs/layers/lang/html.md | 13 ++++++++++++- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/autoload/SpaceVim/layers/lang/html.vim b/autoload/SpaceVim/layers/lang/html.vim index 0ad4fad38..df609189d 100644 --- a/autoload/SpaceVim/layers/lang/html.vim +++ b/autoload/SpaceVim/layers/lang/html.vim @@ -34,6 +34,13 @@ " < " +if exists('s:user_emmet_leader_key') + finish + +endif + +let s:user_emmet_leader_key = '' + function! SpaceVim#layers#lang#html#plugins() abort let plugins = [ @@ -49,7 +56,7 @@ function! SpaceVim#layers#lang#html#plugins() abort endfunction function! SpaceVim#layers#lang#html#config() abort - let g:user_emmet_leader_key=get(g:, 'user_emmet_leader_key', '') + let g:user_emmet_leader_key = s:user_emmet_leader_key augroup spacevim_lang_html autocmd! autocmd FileType html,css,scss,sass,less,javascript,jsp,vue,eex,php call s:install_emmet() @@ -58,6 +65,10 @@ function! SpaceVim#layers#lang#html#config() abort augroup END endfunction +function! SpaceVim#layers#lang#html#set_variable(var) abort + let s:user_emmet_leader_key = get(a:var, 'user_emmet_leader_key', s:user_emmet_leader_key) +endfunction + function! s:install_emmet() abort try diff --git a/docs/cn/layers/lang/html.md b/docs/cn/layers/lang/html.md index 482e3ec1a..af8a65773 100644 --- a/docs/cn/layers/lang/html.md +++ b/docs/cn/layers/lang/html.md @@ -11,6 +11,7 @@ lang: zh - [模块描述](#模块描述) - [启用模块](#启用模块) - [安装语言服务器](#安装语言服务器) +- [模块选项](#模块选项) - [功能特性](#功能特性) - [快捷键](#快捷键) @@ -37,6 +38,16 @@ lang: zh npm install --global vscode-html-languageserver-bin ``` +## 模块选项 + +- `user_emmet_leader_key`: 设置插件 emmet 的默认前置键。 + + ```toml + [layers] + name = "lang#html" + user_emmet_leader_key = "" + ``` + ## 功能特性 - 通过[neosnippet](https://github.com/Shougo/neosnippet.vim/) 和 [emmet-vim](https://github.com/mattn/emmet-vim) 自动生成 HTML、CSS 代码块 diff --git a/docs/layers/lang/html.md b/docs/layers/lang/html.md index 90d35f06a..725f4db5c 100644 --- a/docs/layers/lang/html.md +++ b/docs/layers/lang/html.md @@ -10,6 +10,7 @@ description: "Edit html in SpaceVim, with this layer, this layer provides code c - [Description](#description) - [Install](#install) - [Language server](#language-server) +- [Layer options](#layer-options) - [Features](#features) - [Key bindings](#key-bindings) @@ -36,10 +37,20 @@ To install the language server, you need `npm` on your machine: npm install --global vscode-html-languageserver-bin ``` +## Layer options + +- `user_emmet_leader_key`: change the default leader key for emmet. + + ```toml + [layers] + name = "lang#html" + user_emmet_leader_key = "" + ``` + ## Features - Generate HTML and CSS coding using [neosnippet](https://github.com/Shougo/neosnippet.vim/) and [emmet-vim](https://github.com/mattn/emmet-vim) -- Tags navigation on key % using matchit.vim +- Tags navigation on key `%` using vim-matchup - auto-completion - syntax checking - language server protocol (need `lsp` layer)