Merge pull request #1 from mark2185/feature/non-standard-extensions

Support for non standard extensions

Author: mark2185

README.md

@@ -14,15 +14,6 @@
 Just call `:Alternate` and the window will open
 a matching source/header file to the currently opened one.
 
-## Commands
-Alternate
-* looks for a file with the same name, but a different extension
-* it cycles through all the extensions, starting from the current buffer's extension
-
-## Mappings
-The only mapping this plugin provides is:
- `<Plug>(Alternate)`
-
 ## Configuration
 The file extensions the plugin looks for are stored in the
 following arrays:
@@ -45,6 +36,31 @@ Default value is:
 [ 'node_modules', '.git' ]
 ```
 
+## Commands
+Alternate
+* strips the longest extension, and then looks for a file with the same name, but a different extension
+* it cycles through all the extensions, starting from the longest matching one
+
+Note: it supports even non-standard extensions, doesn't have to be an e.g. `.hpp` (see example below)
+
+```
+let g:alternator_source_extensions = [ '.c'            ]
+let g:alternator_header_extensions = [ '_impl.h', '.h' ]
+:edit action.c
+:Alternate
+# the longest matching extension is '.c', basename is 'action',
+# so it will start the search with the next one, 'action_impl.h'
+
+:edit action_impl.h
+:Alternate
+# the longest matching extension is '_impl.h', basename is 'action',
+# so it will start the search with the next one, 'action.h'
+```
+
+## Mappings
+The only mapping this plugin provides is:
+ `<Plug>(Alternate)`
+
 ## Bonus
 
 If you have `fd` in your path, it will be used instead of vim's `findfile`.

autoload/alternator.vim

@@ -16,7 +16,7 @@ endfunction
 
 function! s:findFiles( filename ) abort
     if executable( 'fd' ) == 1
-        return systemlist( printf( 'fd --glob %s .', a:filename ) )
+        return systemlist( printf( 'fd --color=never --glob %s .', a:filename ) )
     else
         return findfile( a:filename, '**', -1 )
     endif
@@ -30,9 +30,23 @@ function! alternator#alternate() abort
 
     let l:all_extensions = g:alternator_header_extensions + g:alternator_source_extensions
 
-    let l:filename  = expand( '%:t:r' )
-    let l:extension = expand( '%:e'   )
-    let l:idx = index( l:all_extensions, '.' . extension )
+    const buffer_name  = expand( '%:t' )
+    let l:extension = ''
+    let l:filename  = ''
+    let l:len_max = -1
+    for ext in l:all_extensions
+        " echom 'Checking for... ' .. ext
+        let l:filename = substitute( l:buffer_name, ext .. '$', '', '' )
+        let l:length = len( l:buffer_name ) - len( l:filename )
+        if l:length > l:len_max
+            " echom 'This is better!'
+            let l:len_max = l:length
+            let l:extension = l:ext
+        endif
+    endfor
+    let l:filename = substitute( l:buffer_name, l:extension .. '$', '', '' )
+
+    let l:idx = index( l:all_extensions, l:extension )
 
     if l:idx < 0
         echom printf('Extension %s not supported', l:extension)

autoload/alternator9.vim

@@ -17,7 +17,7 @@ enddef
 
 def FindFiles( filename: string ): list< string >
     if executable( 'fd' ) == 1
-        return systemlist( printf( 'fd --glob %s .', filename ) )
+        return systemlist( printf( 'fd --color=never --glob %s .', filename ) )
     else
         return findfile( filename, '**', -1 )
     endif
@@ -31,11 +31,29 @@ export def Alternate(): void
 
     const all_extensions: list< string > = g:alternator_header_extensions + g:alternator_source_extensions
 
-    const filename  = expand( '%:t:r' )
-    const extension = expand( '%:e'   )
-    var idx = index( all_extensions, '.' .. extension )
+    const buffer_name  = expand( '%:t' )
+    var extension = ''
+    var filename  = ''
+    var len_max = -1
+    for ext in all_extensions
+        # echom 'Checking for... ' .. ext
+        filename = substitute( buffer_name, ext .. '$', '', '' )
+        const length = len( buffer_name ) - len( filename )
+        if length > len_max
+            # echom 'This is better!'
+            len_max = length
+            extension = ext
+        endif
+    endfor
+    filename = substitute( buffer_name, extension .. '$', '', '' )
+
+    var idx = index( all_extensions, extension )
 
     if idx < 0
+        if index( [ 'c', 'cpp' ], &ft ) == -1
+            echom printf( 'Filetype "%s" not supported! Only c and cpp are supported!', &ft )
+            return
+        endif
         echom printf( 'Extension %s not supported', extension )
         return
     endif

doc/alternator.txt

@@ -5,9 +5,9 @@ Contents ~
 
  1. Introduction                                      |alternator-introduction|
  2. Usage                                                    |alternator-usage|
- 3. Commands                                              |alternator-commands|
- 4. Mappings                                              |alternator-mappings|
- 5. Configuration                                    |alternator-configuration|
+ 3. Configuration                                    |alternator-configuration|
+ 4. Commands                                              |alternator-commands|
+ 5. Mappings                                              |alternator-mappings|
  6. Bonus                                                    |alternator-bonus|
 
 ===============================================================================
@@ -19,8 +19,8 @@ Introduction ~
       //_\\| | __/ _ \ '__| '_ \ / _` | __/ _ \| '__|~
      /  _  \ | ||  __/ |  | | | | (_| | || (_) | |   ~
      \_/ \_/_|\__\___|_|  |_| |_|\__,_|\__\___/|_|   ~
-  
-         Alternating between headers, source files, 
+
+         Alternating between headers, source files,
   template implementations and others with blazing speed!
 <
 ===============================================================================
@@ -30,19 +30,6 @@ Usage ~
 Just call ':Alternate' and the window will open a matching source/header file
 to the currently opened one.
 
-===============================================================================
-                                                          *alternator-commands*
-Commands ~
-
-Alternate _looks for a file with the same name, but a different extension_ it
-cycles through all the extensions, starting from the current buffer's extension
-
-===============================================================================
-                                                          *alternator-mappings*
-Mappings ~
-
-The only mapping this plugin provides is: '<Plug>(Alternate)'
-
 ===============================================================================
                                                      *alternator-configuration*
 Configuration ~
@@ -64,6 +51,35 @@ Default value is:
 >
   [ 'node_modules', '.git' ]
 <
+===============================================================================
+                                                          *alternator-commands*
+Commands ~
+
+Alternate _strips the longest extension, and then looks for a file with the
+same name, but a different extension_ it cycles through all the extensions,
+starting from the longest matching one
+
+Note: it supports even non-standard extensions, doesn't have to be an e.g.
+'.hpp' (see example below)
+>
+  let g:alternator_source_extensions = [ '.c'            ]
+  let g:alternator_header_extensions = [ '_impl.h', '.h' ]
+  :edit action.c
+  :Alternate
+  # the longest matching extension is '.c', basename is 'action',
+  # so it will start the search with the next one, 'action_impl.h'
+
+  :edit action_impl.h
+  :Alternate
+  # the longest matching extension is '_impl.h', basename is 'action',
+  # so it will start the search with the next one, 'action.h'
+<
+===============================================================================
+                                                          *alternator-mappings*
+Mappings ~
+
+The only mapping this plugin provides is: '<Plug>(Alternate)'
+
 ===============================================================================
                                                              *alternator-bonus*
 Bonus ~

plugin/alternator.vim

@@ -4,7 +4,7 @@
 if exists('g:loaded_alternator_plugin')
     finish
 endif
-let g:loaded_alternator_plugin = 1
+const g:loaded_alternator_plugin = 1
 
 let g:alternator_header_extensions = get( g:, 'alternator_header_extensions', [ '.h', '.hpp', '.tpp', '.ipp' ] )
 let g:alternator_source_extensions = get( g:, 'alternator_source_extensions', [ '.c', '.cpp',                ] )