Skip to content

Support lambda symbol. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattn merged 3 commits into from
Feb 28, 2015
Merged

Support lambda symbol. #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5846f0
Update header.
kamichidu Feb 28, 2015
49dd736
Avoid error when sourcing other syntaxes.
kamichidu Feb 28, 2015
a21e5ee
Don't match javaError if it's a lambda symbol.
kamichidu Feb 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions syntax/java.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
" Vim syntax file
" Language: Java
" Maintainer: Claudio Fleiner <claudio@fleiner.com>
" URL: http://www.fleiner.com/vim/syntax/java.vim
" Last Change: 2012 Oct 05

" Current Maintainer: kamichidu <c.kamunagi@gmail.com>
" Current URL: http://github.com/vim-jp/vim-java/
" Previous Maintainer: Claudio Fleiner <claudio@fleiner.com>
" 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
Expand All @@ -30,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 "\.\.\."

Expand Down Expand Up @@ -108,8 +109,8 @@ if exists("java_highlight_all") || exists("java_highlight_java") || exists("ja
syn cluster javaTop add=javaLangObject
endif

if filereadable(expand("<sfile>:p:h")."/javaid.vim")
source <sfile>:p:h/javaid.vim
if globpath(&runtimepath, 'syntax/javaid.vim') !=# ''
source syntax/javaid.vim
endif

if exists("java_space_errors")
Expand Down Expand Up @@ -153,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 <sfile>: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
Expand Down