From c5846f042cf343a98e7f2acdde52733029c6b745 Mon Sep 17 00:00:00 2001 From: kamichidu Date: Sat, 28 Feb 2015 16:39:44 +0900 Subject: [PATCH 1/3] Update header. --- syntax/java.vim | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/syntax/java.vim b/syntax/java.vim index e5491b2..95e4af8 100644 --- a/syntax/java.vim +++ b/syntax/java.vim @@ -1,9 +1,10 @@ " Vim syntax file " Language: Java -" Maintainer: Claudio Fleiner -" URL: http://www.fleiner.com/vim/syntax/java.vim -" Last Change: 2012 Oct 05 - +" Current Maintainer: kamichidu +" Current URL: http://github.com/vim-jp/vim-java/ +" Previous Maintainer: Claudio Fleiner +" Previous URL: http://www.fleiner.com/vim/syntax/java.vim +" Last Change: 2015 Feb 28 " Please check :help java.vim for comments on some of the options available. " Quit when a syntax file was already loaded From 49dd73619390968f4a37e015a38a952e201b4efb Mon Sep 17 00:00:00 2001 From: kamichidu Date: Sat, 28 Feb 2015 16:40:33 +0900 Subject: [PATCH 2/3] Avoid error when sourcing other syntaxes. --- syntax/java.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syntax/java.vim b/syntax/java.vim index 95e4af8..47a31f4 100644 --- a/syntax/java.vim +++ b/syntax/java.vim @@ -109,8 +109,8 @@ if exists("java_highlight_all") || exists("java_highlight_java") || exists("ja syn cluster javaTop add=javaLangObject endif -if filereadable(expand(":p:h")."/javaid.vim") - source :p:h/javaid.vim +if globpath(&runtimepath, 'syntax/javaid.vim') !=# '' + source syntax/javaid.vim endif if exists("java_space_errors") @@ -154,10 +154,10 @@ JavaHiLink javaCommentCharacter javaCharacter syn cluster javaTop add=javaComment,javaLineComment -if !exists("java_ignore_javadoc") && main_syntax != 'jsp' +if !exists("java_ignore_javadoc") && main_syntax != 'jsp' && globpath(&runtimepath, 'syntax/html.vim') !=# '' syntax case ignore " syntax coloring for javadoc comments (HTML) - syntax include @javaHtml :p:h/html.vim + syntax include @javaHtml syntax/html.vim unlet b:current_syntax " HTML enables spell checking for all text that is not in a syntax item. This " is wrong for Java (all identifiers would be spell-checked), so it's undone From a21e5ee04576920e7083bf274aa4aca3409c57b4 Mon Sep 17 00:00:00 2001 From: kamichidu Date: Sat, 28 Feb 2015 16:41:07 +0900 Subject: [PATCH 3/3] Don't match javaError if it's a lambda symbol. --- syntax/java.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/java.vim b/syntax/java.vim index 47a31f4..ba63733 100644 --- a/syntax/java.vim +++ b/syntax/java.vim @@ -31,7 +31,7 @@ endif " some characters that cannot be in a java program (outside a string) syn match javaError "[\\@`]" -syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|[^-]->\|\*\/" +syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/" syn match javaOK "\.\.\."