Allow overriding filetype detection

Author: AndrewRadev

autoload/inline_edit.vim

@@ -60,8 +60,16 @@ function! inline_edit#MarkdownFencedCode()
     return []
   endif
   let start    = line('.') + 1
-  let filetype = matchlist(getline('.'), start_pattern, 0)[1]
-  let filetype = tolower(filetype)
+  let filetype_match = matchlist(getline('.'), start_pattern, 0)
+
+  if len(filetype_match) > 0
+    let filetype = filetype_match[1]
+    let filetype = tolower(filetype)
+  else
+    " The start pattern doesn't match, the end one does. It's a weird
+    " scenario, but it works out in practice.
+    let filetype = ''
+  endif
 
   " find end of area
   if searchpair(start_pattern, '', end_pattern, 'W') <= 0

autoload/inline_edit/controller.vim

@@ -71,12 +71,16 @@ function! inline_edit#controller#VisualEdit(filetype) dict
   call self.NewProxy(start, end, filetype, indent)
 endfunction
 
-function! inline_edit#controller#PatternEdit(pattern) dict
+function! inline_edit#controller#PatternEdit(pattern, filetype_override) dict
   let pattern = extend({
         \ 'sub_filetype':      &filetype,
         \ 'indent_adjustment': 0,
         \ }, a:pattern)
 
+  if a:filetype_override != ''
+    let pattern.sub_filetype = a:filetype_override
+  endif
+
   call inline_edit#PushCursor()
 
   " find start of area
@@ -131,12 +135,16 @@ function! inline_edit#controller#PatternEdit(pattern) dict
   return 1
 endfunction
 
-function! inline_edit#controller#IndentEdit(pattern) dict
+function! inline_edit#controller#IndentEdit(pattern, filetype_override) dict
   let pattern = extend({
         \ 'sub_filetype':      &filetype,
         \ 'indent_adjustment': 0,
         \ }, a:pattern)
 
+  if a:filetype_override != ''
+    let pattern.sub_filetype = a:filetype_override
+  endif
+
   call inline_edit#PushCursor()
 
   " find start of area

plugin/inline_edit.vim

@@ -43,6 +43,7 @@ call add(g:inline_edit_patterns, {
       \ 'main_filetype': 'markdown',
       \ 'callback':      'inline_edit#MarkdownFencedCode',
       \ })
+
 call add(g:inline_edit_patterns, {
       \ 'main_filetype': 'rmd',
       \ 'callback':      'inline_edit#MarkdownFencedCode',
@@ -194,11 +195,16 @@ function! s:InlineEdit(count, filetype)
 
         if !empty(result)
           call call(controller.NewProxy, result, controller)
+
+          if a:filetype != ''
+            let &filetype = a:filetype
+          endif
+
           return
         endif
-      elseif get(entry, 'indent_based', 0) && controller.IndentEdit(entry)
+      elseif get(entry, 'indent_based', 0) && controller.IndentEdit(entry, a:filetype)
         return
-      elseif !get(entry, 'indent_based', 0) && controller.PatternEdit(entry)
+      elseif !get(entry, 'indent_based', 0) && controller.PatternEdit(entry, a:filetype)
         return
       endif
     endfor

spec/plugin/editing_spec.rb

@@ -16,6 +16,9 @@
     buffer_contents = get_buffer_contents
     expect(buffer_contents.strip).to eq 'alert("Foo");'
 
+    filetype = vim.echo('&filetype')
+    expect(filetype).to eq 'javascript'
+
     vim.search 'Foo'
     vim.normal 'cwBar'
     vim.write
@@ -28,4 +31,18 @@
       </script>
     EOF
   end
+
+  specify "explicit filetype override" do
+    set_file_contents <<~HTML
+      <script>
+        alert("Foo");
+      </script>
+    HTML
+
+    vim.search 'script'
+    vim.command 'InlineEdit typescript'
+
+    filetype = vim.echo('&filetype')
+    expect(filetype).to eq 'typescript'
+  end
 end

spec/plugin/haml_spec.rb

@@ -44,4 +44,19 @@
       .content { border: 1px solid black; }
     HTML
   end
+
+  specify "explicit filetype" do
+    set_file_contents <<~HTML
+      %body
+        :javascript
+          alert("OK");
+    HTML
+
+    vim.search 'alert'
+    vim.command 'InlineEdit typescript'
+
+    buffer_contents = get_buffer_contents
+
+    expect(vim.echo('&filetype')).to eq 'typescript'
+  end
 end

spec/plugin/markdown_spec.rb

@@ -54,4 +54,30 @@ def foo
       }
     HTML
   end
+
+  specify "unknown code block with explicit filetype" do
+    set_file_contents <<~HTML
+      Some text.
+
+      ```
+      fn foo() {
+        println!("OK");
+      }
+      ```
+
+      Some other text.
+    HTML
+
+    vim.search 'fn foo'
+    vim.command 'InlineEdit rust'
+
+    buffer_contents = get_buffer_contents
+
+    expect(vim.echo('&filetype')).to eq 'rust'
+    expect(buffer_contents).to eq <<~HTML
+      fn foo() {
+        println!("OK");
+      }
+    HTML
+  end
 end