fix(html): make sure html ftplugin does not get triggered with other …

…filetypes
kkoomen · Oct 3, 2023 · af4c73e · af4c73e
1 parent cc1c785
commit af4c73e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
@@ -1,6 +1,11 @@
 let s:save_cpo = &cpoptions
 set cpoptions&vim
 
+" The HTML filetype also gets triggerred for PHP files (and perhaps others).
+if &filetype !=? 'html'
+  finish
+endif
+
 let b:doge_parser = 'html'
 let b:doge_insert = 'above'
 

diff --git a/helper/src/config.rs b/helper/src/config.rs
@@ -26,8 +26,7 @@ pub fn load_doc_config_str<'a>(parser_name: &'a str, doc_name: &'a str) -> &'a s
         "c_kernel_doc" => include_str!("c/docs/kernel_doc.yaml"),
 
         "php_phpdoc" => include_str!("php/docs/phpdoc.yaml"),
-        "typescript_jsdoc" => include_str!("typescript/docs/jsdoc.yaml"),
-        "html_jsdoc" => include_str!("typescript/docs/jsdoc.yaml"),
+        "typescript_jsdoc" | "html_jsdoc" => include_str!("typescript/docs/jsdoc.yaml"),
         "lua_ldoc" => include_str!("lua/docs/ldoc.yaml"),
         "java_javadoc" => include_str!("java/docs/javadoc.yaml"),
         "ruby_YARD" => include_str!("ruby/docs/YARD.yaml"),

diff --git a/plugin/doge.vim b/plugin/doge.vim
@@ -100,8 +100,8 @@ let g:doge_filetype_aliases = doge#utils#deepextend({
 \    'typescript',
 \    'typescript.tsx',
 \  ],
-\  'java': ['groovy'],
 \  'html': ['svelte', 'vue'],
+\  'java': ['groovy'],
 \}, get(g:, 'doge_filetype_aliases', {}), 1)
 
 if !exists('g:doge_buffer_mappings')