Remove java syntax, fixes #723

4 files changed, 0 insertions, 570 deletions

diff --git a/ftplugin/java.vim b/ftplugin/java.vim
deleted file mode 100644
index c94ff1fa..00000000
--- a/ftplugin/java.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'ftplugin/java.vim')
-  finish
-endif
-
-" Vim filetype plugin file
-" Language:	Java
-" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Change:  2012 Mar 11
-" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
-
-if exists("b:did_ftplugin") | finish | endif
-let b:did_ftplugin = 1
-
-" Make sure the continuation lines below do not cause problems in
-" compatibility mode.
-let s:save_cpo = &cpo
-set cpo-=C
-
-" For filename completion, prefer the .java extension over the .class
-" extension.
-set suffixes+=.class
-
-" Enable gf on import statements.  Convert . in the package
-" name to / and append .java to the name, then search the path.
-setlocal includeexpr=substitute(v:fname,'\\.','/','g')
-setlocal suffixesadd=.java
-if exists("g:ftplugin_java_source_path")
-    let &l:path=g:ftplugin_java_source_path . ',' . &l:path
-endif
-
-" Set 'formatoptions' to break comment lines but not other lines,
-" and insert the comment leader when hitting <CR> or using "o".
-setlocal formatoptions-=t formatoptions+=croql
-
-" Set 'comments' to format dashed lists in comments. Behaves just like C.
-setlocal comments& comments^=sO:*\ -,mO:*\ \ ,exO:*/
-
-setlocal commentstring=//%s
-
-" Change the :browse e filter to primarily show Java-related files.
-if has("gui_win32")
-    let  b:browsefilter="Java Files (*.java)\t*.java\n" .
-		\	"Properties Files (*.prop*)\t*.prop*\n" .
-		\	"Manifest Files (*.mf)\t*.mf\n" .
-		\	"All Files (*.*)\t*.*\n"
-endif
-
-" Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal suffixes< suffixesadd<" .
-		\     " formatoptions< comments< commentstring< path< includeexpr<" .
-		\     " | unlet! b:browsefilter"
-
-" Restore the saved compatibility options.
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/indent/java.vim b/indent/java.vim
deleted file mode 100644
index 19f377b2..00000000
--- a/indent/java.vim
+++ /dev/null
@@ -1,154 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'indent/java.vim')
-  finish
-endif
-
-" Vim indent file
-" Language:	Java
-" Previous Maintainer: Toby Allsopp <toby.allsopp@peace.com>
-" Current Maintainer: Hong Xu <hong@topbug.net>
-" Homepage: http://www.vim.org/scripts/script.php?script_id=3899
-"           https://github.com/xuhdev/indent-java.vim
-" Last Change:	2016 Mar 7
-" Version: 1.1
-" License: Same as Vim.
-" Copyright (c) 2012-2016 Hong Xu
-" Before 2012, this file was maintained by Toby Allsopp.
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-" Indent Java anonymous classes correctly.
-setlocal cindent cinoptions& cinoptions+=j1
-
-" The "extends" and "implements" lines start off with the wrong indent.
-setlocal indentkeys& indentkeys+=0=extends indentkeys+=0=implements
-
-" Set the function to do the work.
-setlocal indentexpr=GetJavaIndent()
-
-let b:undo_indent = "set cin< cino< indentkeys< indentexpr<"
-
-" Only define the function once.
-if exists("*GetJavaIndent")
-  finish
-endif
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-function! SkipJavaBlanksAndComments(startline)
-  let lnum = a:startline
-  while lnum > 1
-    let lnum = prevnonblank(lnum)
-    if getline(lnum) =~ '\*/\s*$'
-      while getline(lnum) !~ '/\*' && lnum > 1
-        let lnum = lnum - 1
-      endwhile
-      if getline(lnum) =~ '^\s*/\*'
-        let lnum = lnum - 1
-      else
-        break
-      endif
-    elseif getline(lnum) =~ '^\s*//'
-      let lnum = lnum - 1
-    else
-      break
-    endif
-  endwhile
-  return lnum
-endfunction
-
-function GetJavaIndent()
-
-  " Java is just like C; use the built-in C indenting and then correct a few
-  " specific cases.
-  let theIndent = cindent(v:lnum)
-
-  " If we're in the middle of a comment then just trust cindent
-  if getline(v:lnum) =~ '^\s*\*'
-    return theIndent
-  endif
-
-  " find start of previous line, in case it was a continuation line
-  let lnum = SkipJavaBlanksAndComments(v:lnum - 1)
-
-  " If the previous line starts with '@', we should have the same indent as
-  " the previous one
-  if getline(lnum) =~ '^\s*@.*$'
-    return indent(lnum)
-  endif
-
-  let prev = lnum
-  while prev > 1
-    let next_prev = SkipJavaBlanksAndComments(prev - 1)
-    if getline(next_prev) !~ ',\s*$'
-      break
-    endif
-    let prev = next_prev
-  endwhile
-
-  " Try to align "throws" lines for methods and "extends" and "implements" for
-  " classes.
-  if getline(v:lnum) =~ '^\s*\(throws\|extends\|implements\)\>'
-        \ && getline(lnum) !~ '^\s*\(throws\|extends\|implements\)\>'
-    let theIndent = theIndent + shiftwidth()
-  endif
-
-  " correct for continuation lines of "throws", "implements" and "extends"
-  let cont_kw = matchstr(getline(prev),
-        \ '^\s*\zs\(throws\|implements\|extends\)\>\ze.*,\s*$')
-  if strlen(cont_kw) > 0
-    let amount = strlen(cont_kw) + 1
-    if getline(lnum) !~ ',\s*$'
-      let theIndent = theIndent - (amount + shiftwidth())
-      if theIndent < 0
-        let theIndent = 0
-      endif
-    elseif prev == lnum
-      let theIndent = theIndent + amount
-      if cont_kw ==# 'throws'
-        let theIndent = theIndent + shiftwidth()
-      endif
-    endif
-  elseif getline(prev) =~ '^\s*\(throws\|implements\|extends\)\>'
-        \ && (getline(prev) =~ '{\s*$'
-        \  || getline(v:lnum) =~ '^\s*{\s*$')
-    let theIndent = theIndent - shiftwidth()
-  endif
-
-  " When the line starts with a }, try aligning it with the matching {,
-  " skipping over "throws", "extends" and "implements" clauses.
-  if getline(v:lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$'
-    call cursor(v:lnum, 1)
-    silent normal! %
-    let lnum = line('.')
-    if lnum < v:lnum
-      while lnum > 1
-        let next_lnum = SkipJavaBlanksAndComments(lnum - 1)
-        if getline(lnum) !~ '^\s*\(throws\|extends\|implements\)\>'
-              \ && getline(next_lnum) !~ ',\s*$'
-          break
-        endif
-        let lnum = prevnonblank(next_lnum)
-      endwhile
-      return indent(lnum)
-    endif
-  endif
-
-  " Below a line starting with "}" never indent more.  Needed for a method
-  " below a method with an indented "throws" clause.
-  let lnum = SkipJavaBlanksAndComments(v:lnum - 1)
-  if getline(lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$' && indent(lnum) < theIndent
-    let theIndent = indent(lnum)
-  endif
-
-  return theIndent
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vi: sw=2 et
diff --git a/packages.yaml b/packages.yaml
index e4295b07..4c4fa9dd 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -3207,8 +3207,6 @@ filetypes:
   - pattern: Prl*.*,JAM*.*
 ---
 name: java
-remote: vim/vim:runtime
-glob: "**/java.vim"
 filetypes:
 - name: java
   patterns:
diff --git a/syntax/java.vim b/syntax/java.vim
deleted file mode 100644
index c445e00e..00000000
--- a/syntax/java.vim
+++ /dev/null
@@ -1,359 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'syntax/java.vim')
-  finish
-endif
-
-" Vim syntax file
-" Language:	Java
-" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:          https://github.com/fleiner/vim/blob/master/runtime/syntax/java.vim
-" Last Change:	2018 July 26
-
-" Please check :help java.vim for comments on some of the options available.
-
-" quit when a syntax file was already loaded
-if !exists("main_syntax")
-  if exists("b:current_syntax")
-    finish
-  endif
-  " we define it here so that included files can test for it
-  let main_syntax='java'
-  syn region javaFold start="{" end="}" transparent fold
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" some characters that cannot be in a java program (outside a string)
-syn match javaError "[\\@`]"
-syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
-
-syn match javaOK "\.\.\."
-
-" use separate name so that it can be deleted in javacc.vim
-syn match   javaError2 "#\|=<"
-hi def link javaError2 javaError
-
-" keyword definitions
-syn keyword javaExternal	native package
-syn match javaExternal		"\<import\>\(\s\+static\>\)\?"
-syn keyword javaError		goto const
-syn keyword javaConditional	if else switch
-syn keyword javaRepeat		while for do
-syn keyword javaBoolean		true false
-syn keyword javaConstant	null
-syn keyword javaTypedef		this super
-syn keyword javaOperator	var new instanceof
-syn keyword javaType		boolean char byte short int long float double
-syn keyword javaType		void
-syn keyword javaStatement	return
-syn keyword javaStorageClass	static synchronized transient volatile final strictfp serializable
-syn keyword javaExceptions	throw try catch finally
-syn keyword javaAssert		assert
-syn keyword javaMethodDecl	synchronized throws
-syn keyword javaClassDecl	extends implements interface
-" to differentiate the keyword class from MyClass.class we use a match here
-syn match   javaTypedef		"\.\s*\<class\>"ms=s+1
-syn keyword javaClassDecl	enum
-syn match   javaClassDecl	"^class\>"
-syn match   javaClassDecl	"[^.]\s*\<class\>"ms=s+1
-syn match   javaAnnotation	"@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>" contains=javaString
-syn match   javaClassDecl	"@interface\>"
-syn keyword javaBranch		break continue nextgroup=javaUserLabelRef skipwhite
-syn match   javaUserLabelRef	"\k\+" contained
-syn match   javaVarArg		"\.\.\."
-syn keyword javaScopeDecl	public protected private abstract
-
-" Java Modules(Since Java 9, for "module-info.java" file)
-if fnamemodify(bufname("%"), ":t") == "module-info.java"
-    syn keyword javaModuleStorageClass	module transitive
-    syn keyword javaModuleStmt		open requires exports opens uses provides
-    syn keyword javaModuleExternal	to with
-    syn cluster javaTop add=javaModuleStorageClass,javaModuleStmt,javaModuleExternal
-endif
-
-if exists("java_highlight_java_lang_ids")
-  let java_highlight_all=1
-endif
-if exists("java_highlight_all")  || exists("java_highlight_java")  || exists("java_highlight_java_lang")
-  " java.lang.*
-  syn match javaLangClass "\<System\>"
-  syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
-  syn cluster javaTop add=javaR_JavaLang
-  syn cluster javaClasses add=javaR_JavaLang
-  hi def link javaR_JavaLang javaR_Java
-  syn keyword javaC_JavaLang Process RuntimePermission StringKeySet CharacterData01 Class ThreadLocal ThreadLocalMap CharacterData0E Package Character StringCoding Long ProcessImpl ProcessEnvironment Short AssertionStatusDirectives 1PackageInfoProxy UnicodeBlock InheritableThreadLocal AbstractStringBuilder StringEnvironment ClassLoader ConditionalSpecialCasing CharacterDataPrivateUse StringBuffer StringDecoder Entry StringEntry WrappedHook StringBuilder StrictMath State ThreadGroup Runtime CharacterData02 MethodArray Object CharacterDataUndefined Integer Gate Boolean Enum Variable Subset StringEncoder Void Terminator CharsetSD IntegerCache CharacterCache Byte CharsetSE Thread SystemClassLoaderAction CharacterDataLatin1 StringValues StackTraceElement Shutdown ShortCache String ConverterSD ByteCache Lock EnclosingMethodInfo Math Float Value Double SecurityManager LongCache ProcessBuilder StringEntrySet Compiler Number UNIXProcess ConverterSE ExternalData CaseInsensitiveComparator CharacterData00 NativeLibrary
-  syn cluster javaTop add=javaC_JavaLang
-  syn cluster javaClasses add=javaC_JavaLang
-  hi def link javaC_JavaLang javaC_Java
-  syn keyword javaE_JavaLang IncompatibleClassChangeError InternalError UnknownError ClassCircularityError AssertionError ThreadDeath IllegalAccessError NoClassDefFoundError ClassFormatError UnsupportedClassVersionError NoSuchFieldError VerifyError ExceptionInInitializerError InstantiationError LinkageError NoSuchMethodError Error UnsatisfiedLinkError StackOverflowError AbstractMethodError VirtualMachineError OutOfMemoryError
-  syn cluster javaTop add=javaE_JavaLang
-  syn cluster javaClasses add=javaE_JavaLang
-  hi def link javaE_JavaLang javaE_Java
-  syn keyword javaX_JavaLang CloneNotSupportedException Exception NoSuchMethodException IllegalAccessException NoSuchFieldException Throwable InterruptedException ClassNotFoundException InstantiationException
-  syn cluster javaTop add=javaX_JavaLang
-  syn cluster javaClasses add=javaX_JavaLang
-  hi def link javaX_JavaLang javaX_Java
-
-  hi def link javaR_Java javaR_
-  hi def link javaC_Java javaC_
-  hi def link javaE_Java javaE_
-  hi def link javaX_Java javaX_
-  hi def link javaX_		     javaExceptions
-  hi def link javaR_		     javaExceptions
-  hi def link javaE_		     javaExceptions
-  hi def link javaC_		     javaConstant
-
-  syn keyword javaLangObject clone equals finalize getClass hashCode
-  syn keyword javaLangObject notify notifyAll toString wait
-  hi def link javaLangObject		     javaConstant
-  syn cluster javaTop add=javaLangObject
-endif
-
-if filereadable(expand("<sfile>:p:h")."/javaid.vim")
-  source <sfile>:p:h/javaid.vim
-endif
-
-if exists("java_space_errors")
-  if !exists("java_no_trail_space_error")
-    syn match	javaSpaceError	"\s\+$"
-  endif
-  if !exists("java_no_tab_space_error")
-    syn match	javaSpaceError	" \+\t"me=e-1
-  endif
-endif
-
-syn region  javaLabelRegion	transparent matchgroup=javaLabel start="\<case\>" matchgroup=NONE end=":" contains=javaNumber,javaCharacter,javaString
-syn match   javaUserLabel	"^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=javaLabel
-syn keyword javaLabel		default
-
-" highlighting C++ keywords as errors removed, too many people find it
-" annoying.  Was: if !exists("java_allow_cpp_keywords")
-
-" The following cluster contains all java groups except the contained ones
-syn cluster javaTop add=javaExternal,javaError,javaError,javaBranch,javaLabelRegion,javaLabel,javaConditional,javaRepeat,javaBoolean,javaConstant,javaTypedef,javaOperator,javaType,javaType,javaStatement,javaStorageClass,javaAssert,javaExceptions,javaMethodDecl,javaClassDecl,javaClassDecl,javaClassDecl,javaScopeDecl,javaError,javaError2,javaUserLabel,javaLangObject,javaAnnotation,javaVarArg
-
-
-" Comments
-syn keyword javaTodo		 contained TODO FIXME XXX
-if exists("java_comment_strings")
-  syn region  javaCommentString    contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=javaSpecial,javaCommentStar,javaSpecialChar,@Spell
-  syn region  javaComment2String   contained start=+"+	end=+$\|"+  contains=javaSpecial,javaSpecialChar,@Spell
-  syn match   javaCommentCharacter contained "'\\[^']\{1,6\}'" contains=javaSpecialChar
-  syn match   javaCommentCharacter contained "'\\''" contains=javaSpecialChar
-  syn match   javaCommentCharacter contained "'[^\\]'"
-  syn cluster javaCommentSpecial add=javaCommentString,javaCommentCharacter,javaNumber
-  syn cluster javaCommentSpecial2 add=javaComment2String,javaCommentCharacter,javaNumber
-endif
-syn region  javaComment		 start="/\*"  end="\*/" contains=@javaCommentSpecial,javaTodo,@Spell
-syn match   javaCommentStar	 contained "^\s*\*[^/]"me=e-1
-syn match   javaCommentStar	 contained "^\s*\*$"
-syn match   javaLineComment	 "//.*" contains=@javaCommentSpecial2,javaTodo,@Spell
-hi def link javaCommentString javaString
-hi def link javaComment2String javaString
-hi def link javaCommentCharacter javaCharacter
-
-syn cluster javaTop add=javaComment,javaLineComment
-
-if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
-  syntax case ignore
-  " syntax coloring for javadoc comments (HTML)
-  syntax include @javaHtml <sfile>:p:h/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
-  " here.
-  syntax spell default
-
-  syn region  javaDocComment	start="/\*\*"  end="\*/" keepend contains=javaCommentTitle,@javaHtml,javaDocTags,javaDocSeeTag,javaTodo,@Spell
-  syn region  javaCommentTitle	contained matchgroup=javaDocComment start="/\*\*"   matchgroup=javaCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@javaHtml,javaCommentStar,javaTodo,@Spell,javaDocTags,javaDocSeeTag
-
-  syn region javaDocTags	 contained start="{@\(code\|link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
-  syn match  javaDocTags	 contained "@\(param\|exception\|throws\|since\)\s\+\S\+" contains=javaDocParam
-  syn match  javaDocParam	 contained "\s\S\+"
-  syn match  javaDocTags	 contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
-  syn region javaDocSeeTag	 contained matchgroup=javaDocTags start="@see\s\+" matchgroup=NONE end="\_."re=e-1 contains=javaDocSeeTagParam
-  syn match  javaDocSeeTagParam  contained @"\_[^"]\+"\|<a\s\+\_.\{-}</a>\|\(\k\|\.\)*\(#\k\+\((\_[^)]\+)\)\=\)\=@ extend
-  syntax case match
-endif
-
-" match the special comment /**/
-syn match   javaComment		 "/\*\*/"
-
-" Strings and constants
-syn match   javaSpecialError	 contained "\\."
-syn match   javaSpecialCharError contained "[^']"
-syn match   javaSpecialChar	 contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
-syn region  javaString		start=+"+ end=+"+ end=+$+ contains=javaSpecialChar,javaSpecialError,@Spell
-" next line disabled, it can cause a crash for a long line
-"syn match   javaStringError	  +"\([^"\\]\|\\.\)*$+
-syn match   javaCharacter	 "'[^']*'" contains=javaSpecialChar,javaSpecialCharError
-syn match   javaCharacter	 "'\\''" contains=javaSpecialChar
-syn match   javaCharacter	 "'[^\\]'"
-syn match   javaNumber		 "\<\(0[bB][0-1]\+\|0[0-7]*\|0[xX]\x\+\|\d\(\d\|_\d\)*\)[lL]\=\>"
-syn match   javaNumber		 "\(\<\d\(\d\|_\d\)*\.\(\d\(\d\|_\d\)*\)\=\|\.\d\(\d\|_\d\)*\)\([eE][-+]\=\d\(\d\|_\d\)*\)\=[fFdD]\="
-syn match   javaNumber		 "\<\d\(\d\|_\d\)*[eE][-+]\=\d\(\d\|_\d\)*[fFdD]\=\>"
-syn match   javaNumber		 "\<\d\(\d\|_\d\)*\([eE][-+]\=\d\(\d\|_\d\)*\)\=[fFdD]\>"
-
-" unicode characters
-syn match   javaSpecial "\\u\d\{4\}"
-
-syn cluster javaTop add=javaString,javaCharacter,javaNumber,javaSpecial,javaStringError
-
-if exists("java_highlight_functions")
-  if java_highlight_functions == "indent"
-    syn match  javaFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]<>]*([^-+*/]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
-    syn region javaFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
-    syn match  javaFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
-    syn region javaFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
-  else
-    " This line catches method declarations at any indentation>0, but it assumes
-    " two things:
-    "	1. class names are always capitalized (ie: Button)
-    "	2. method names are never capitalized (except constructors, of course)
-    "syn region javaFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^>]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*([^0-9]+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,javaComment,javaLineComment,@javaClasses
-    syn region javaFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(<.*>\s\+\)\?\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^(){}]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*(+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,javaComment,javaLineComment,@javaClasses,javaAnnotation
-  endif
-  syn match javaLambdaDef "[a-zA-Z_][a-zA-Z0-9_]*\s*->"
-  syn match  javaBraces  "[{}]"
-  syn cluster javaTop add=javaFuncDef,javaBraces,javaLambdaDef
-endif
-
-if exists("java_highlight_debug")
-
-  " Strings and constants
-  syn match   javaDebugSpecial		contained "\\\d\d\d\|\\."
-  syn region  javaDebugString		contained start=+"+  end=+"+  contains=javaDebugSpecial
-  syn match   javaDebugStringError	+"\([^"\\]\|\\.\)*$+
-  syn match   javaDebugCharacter	contained "'[^\\]'"
-  syn match   javaDebugSpecialCharacter contained "'\\.'"
-  syn match   javaDebugSpecialCharacter contained "'\\''"
-  syn match   javaDebugNumber		contained "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
-  syn match   javaDebugNumber		contained "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
-  syn match   javaDebugNumber		contained "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
-  syn match   javaDebugNumber		contained "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
-  syn keyword javaDebugBoolean		contained true false
-  syn keyword javaDebugType		contained null this super
-  syn region javaDebugParen  start=+(+ end=+)+ contained contains=javaDebug.*,javaDebugParen
-
-  " to make this work you must define the highlighting for these groups
-  syn match javaDebug "\<System\.\(out\|err\)\.print\(ln\)*\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
-  syn match javaDebug "\<p\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
-  syn match javaDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
-  syn match javaDebug "\<trace[SL]\=\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
-
-  syn cluster javaTop add=javaDebug
-
-  hi def link javaDebug		 Debug
-  hi def link javaDebugString		 DebugString
-  hi def link javaDebugStringError	 javaError
-  hi def link javaDebugType		 DebugType
-  hi def link javaDebugBoolean		 DebugBoolean
-  hi def link javaDebugNumber		 Debug
-  hi def link javaDebugSpecial		 DebugSpecial
-  hi def link javaDebugSpecialCharacter DebugSpecial
-  hi def link javaDebugCharacter	 DebugString
-  hi def link javaDebugParen		 Debug
-
-  hi def link DebugString		 String
-  hi def link DebugSpecial		 Special
-  hi def link DebugBoolean		 Boolean
-  hi def link DebugType		 Type
-endif
-
-if exists("java_mark_braces_in_parens_as_errors")
-  syn match javaInParen		 contained "[{}]"
-  hi def link javaInParen	javaError
-  syn cluster javaTop add=javaInParen
-endif
-
-" catch errors caused by wrong parenthesis
-syn region  javaParenT	transparent matchgroup=javaParen  start="(" end=")" contains=@javaTop,javaParenT1
-syn region  javaParenT1 transparent matchgroup=javaParen1 start="(" end=")" contains=@javaTop,javaParenT2 contained
-syn region  javaParenT2 transparent matchgroup=javaParen2 start="(" end=")" contains=@javaTop,javaParenT  contained
-syn match   javaParenError	 ")"
-" catch errors caused by wrong square parenthesis
-syn region  javaParenT	transparent matchgroup=javaParen  start="\[" end="\]" contains=@javaTop,javaParenT1
-syn region  javaParenT1 transparent matchgroup=javaParen1 start="\[" end="\]" contains=@javaTop,javaParenT2 contained
-syn region  javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT  contained
-syn match   javaParenError	 "\]"
-
-hi def link javaParenError	javaError
-
-if exists("java_highlight_functions")
-   syn match javaLambdaDef "([a-zA-Z0-9_<>\[\], \t]*)\s*->"
-   " needs to be defined after the parenthesis error catcher to work
-endif
-
-if !exists("java_minlines")
-  let java_minlines = 10
-endif
-exec "syn sync ccomment javaComment minlines=" . java_minlines
-
-" The default highlighting.
-hi def link javaLambdaDef		Function
-hi def link javaFuncDef		Function
-hi def link javaVarArg			Function
-hi def link javaBraces			Function
-hi def link javaBranch			Conditional
-hi def link javaUserLabelRef		javaUserLabel
-hi def link javaLabel			Label
-hi def link javaUserLabel		Label
-hi def link javaConditional		Conditional
-hi def link javaRepeat			Repeat
-hi def link javaExceptions		Exception
-hi def link javaAssert			Statement
-hi def link javaStorageClass		StorageClass
-hi def link javaMethodDecl		javaStorageClass
-hi def link javaClassDecl		javaStorageClass
-hi def link javaScopeDecl		javaStorageClass
-
-hi def link javaBoolean		Boolean
-hi def link javaSpecial		Special
-hi def link javaSpecialError		Error
-hi def link javaSpecialCharError	Error
-hi def link javaString			String
-hi def link javaCharacter		Character
-hi def link javaSpecialChar		SpecialChar
-hi def link javaNumber			Number
-hi def link javaError			Error
-hi def link javaStringError		Error
-hi def link javaStatement		Statement
-hi def link javaOperator		Operator
-hi def link javaComment		Comment
-hi def link javaDocComment		Comment
-hi def link javaLineComment		Comment
-hi def link javaConstant		Constant
-hi def link javaTypedef		Typedef
-hi def link javaTodo			Todo
-hi def link javaAnnotation		PreProc
-
-hi def link javaCommentTitle		SpecialComment
-hi def link javaDocTags		Special
-hi def link javaDocParam		Function
-hi def link javaDocSeeTagParam		Function
-hi def link javaCommentStar		javaComment
-
-hi def link javaType			Type
-hi def link javaExternal		Include
-
-hi def link htmlComment		Special
-hi def link htmlCommentPart		Special
-hi def link javaSpaceError		Error
-
-if fnamemodify(bufname("%"), ":t") == "module-info.java"
-    hi def link javaModuleStorageClass	StorageClass
-    hi def link javaModuleStmt		Statement
-    hi def link javaModuleExternal	Include
-endif
-
-let b:current_syntax = "java"
-
-if main_syntax == 'java'
-  unlet main_syntax
-endif
-
-let b:spell_options="contained"
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: ts=8