How do I make vim indent java annotations correctly?

Question

When indenting java code with annotations, vim insists on indenting like this:

@Test     public void ... 

I want the annotation to be in the same column as the method definition but I can't seem to find a way to tell vim to do that, except maybe using an indent expression but I'm not sure if I can use that together with regular cindent.

edit: The filetype plugin was already turned on I just got a bit confused about indenting plugins. The accepted answer may be a bit hackish but works for me as well.

Answer 1

You shouldn't modify the built-in vim settings. Your changes could disappear after a package upgrade. If you copy it to your .vim, then you won't get any java indent bug fixes.

Instead, put the following into a new file called ~/.vim/after/indent/java.vim

function! GetJavaIndent_improved()     let theIndent = GetJavaIndent()     let lnum = prevnonblank(v:lnum - 1)     let line = getline(lnum)     if line =~ '^\s*@.*$'         let theIndent = indent(lnum)     endif      return theIndent endfunction setlocal indentexpr=GetJavaIndent_improved() 

That way it loads the stock java indent and only modifies the indent to remove the annotation indents.