Skip to content

Commit bfe18ac

Browse files
committed
Kill deprecated ActiveRecord setter highlighting
Also kill establish_connection, which never really deserved highlighting to begin with.
1 parent b6720d6 commit bfe18ac

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

autoload/rails.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ function! s:readable_calculate_file_type() dict abort
689689
let r = "model-".class
690690
elseif f =~ '_mailer\.rb$'
691691
let r = "mailer"
692-
elseif top =~ '\<\%(validates_\w\+_of\|set_\%(table_name\|primary_key\)\|has_one\|has_many\|belongs_to\)\>'
692+
elseif top =~ '\<\%(validates_\w\+_of\|self\.\%(table_name\|primary_key\)\|has_one\|has_many\|belongs_to\)\>'
693693
let r = "model-arb"
694694
else
695695
let r = "model"
@@ -3058,7 +3058,7 @@ function! s:readable_related(...) dict abort
30583058
" elseif self.type_name('helper')
30593059
" return s:findlayout(s:controller())
30603060
elseif self.type_name('model-arb')
3061-
let table_name = matchstr(join(self.getline(1,50),"\n"),'\n\s*set_table_name\s*[:"'']\zs\w\+')
3061+
let table_name = matchstr(join(self.getline(1,50),"\n"),'\n\s*self\.table_name\s*=\s*[:"'']\zs\w\+')
30623062
if table_name == ''
30633063
let table_name = rails#pluralize(s:gsub(s:sub(fnamemodify(f,':r'),'.{-}<app/models/',''),'/','_'))
30643064
endif
@@ -3568,7 +3568,7 @@ function! s:BufSyntax()
35683568
syn keyword rubyRailsARCallbackMethod after_create after_destroy after_save after_update after_validation after_validation_on_create after_validation_on_update
35693569
syn keyword rubyRailsARCallbackMethod around_create around_destroy around_save around_update
35703570
syn keyword rubyRailsARCallbackMethod after_commit after_find after_initialize after_rollback after_touch
3571-
syn keyword rubyRailsARClassMethod attr_accessible attr_protected attr_readonly establish_connection set_inheritance_column set_locking_column set_primary_key set_sequence_name set_table_name
3571+
syn keyword rubyRailsARClassMethod attr_accessible attr_protected attr_readonly
35723572
syn keyword rubyRailsARValidationMethod validate validates validate_on_create validate_on_update validates_acceptance_of validates_associated validates_confirmation_of validates_each validates_exclusion_of validates_format_of validates_inclusion_of validates_length_of validates_numericality_of validates_presence_of validates_size_of validates_uniqueness_of
35733573
syn keyword rubyRailsMethod logger
35743574
endif

0 commit comments

Comments
 (0)