Give higher precedence to eruby.foo subtype · vim-ruby/vim-ruby@8ee9e43 · GitHub

vim-ruby / vim-ruby Public

• Notifications You must be signed in to change notification settings
• Fork 285
• Star 2k

• Code
• Issues 57
• Pull requests 6
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 8ee9e43

Browse filesBrowse the repository at this point in the historyBrowse files

tpope

committed

Give higher precedence to eruby.foo subtype

Closes gh-23.

1 parent d6f9955 commit 8ee9e43
Copy full SHA for 8ee9e43

2 files changed

+6-8Lines changed: 6 additions & 8 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• ftplugin
  • eruby.vim
• syntax
  • eruby.vim

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎ftplugin/eruby.vim‎

Copy file name to clipboardExpand all lines: ftplugin/eruby.vim

+3-4Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -22,12 +22,11 @@ if !exists("g:eruby_default_subtype")
22	22	let g:eruby_default_subtype = "html"
23	23	endif
24	24
25		- if !exists("b:eruby_subtype")
	25	+ if &filetype =~ '^eruby\.'
	26	+ let b:eruby_subtype = matchstr(&filetype,'^eruby\.\zs\w\+')
	27	+ elseif !exists("b:eruby_subtype")
26	28	let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
27	29	let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+')
28		- if b:eruby_subtype == ''
29		- let b:eruby_subtype = matchstr(&filetype,'^eruby\.\zs\w\+')
30		- endif
31	30	if b:eruby_subtype == ''
32	31	let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+$')
33	32	endif

Collapse file

‎syntax/eruby.vim‎

Copy file name to clipboardExpand all lines: syntax/eruby.vim

+3-4Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -17,12 +17,11 @@ if !exists("g:eruby_default_subtype")
17	17	let g:eruby_default_subtype = "html"
18	18	endif
19	19
20		- if !exists("b:eruby_subtype") && main_syntax == 'eruby'
	20	+ if &filetype =~ '^eruby\.'
	21	+ let b:eruby_subtype = matchstr(&filetype,'^eruby\.\zs\w\+')
	22	+ elseif !exists("b:eruby_subtype") && main_syntax == 'eruby'
21	23	let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
22	24	let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+')
23		- if b:eruby_subtype == ''
24		- let b:eruby_subtype = matchstr(&filetype,'^eruby\.\zs\w\+')
25		- endif
26	25	if b:eruby_subtype == ''
27	26	let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+$')
28	27	endif

0 commit comments

Comments

0 (0)