Merge pull request #8095 from matthiasblaesing/groovy-update

Update Groovy libraries to 3.0.23
apache · Jan 3, 2025 · 0c09359 · 0c09359
2 parents 22f24f0 + 958a05f
commit 0c09359
Show file tree

Hide file tree

Showing 188 changed files with 591 additions and 17,526 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1826,7 +1826,9 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '17' ]
+        java: [ '17', '21' ]
+        exclude:
+          - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
     steps:
 

diff --git a/.../test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldStaticImport.occurrences b/.../test/unit/data/testfiles/AliasOccurrencesTester.groovy.testFieldStaticImport.occurrences
diff --git a/...editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodAlias.occurrences b/...editor/test/unit/data/testfiles/AliasOccurrencesTester.groovy.testMethodAlias.occurrences
diff --git a/.../groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass3.occurrences b/.../groovy.editor/test/unit/data/testfiles/GroovyScopeTestcase.groovy.testClass3.occurrences
@@ -1,2 +1,2 @@
 class TestCase extends ^java.lang.|>MARK_OCCURRENCES:Object<| {
-    def test (|>MARK_OCCURRENCES:Object<| xy = 0 ) {
+    def test (|>MARK_OCCURRENCES:Object<| xy = 0 ) {
diff --git a/...ta/testfiles/completion/CamelCaseConstructor1.groovy.testCamelCaseConstructor1.completion b/...ta/testfiles/completion/CamelCaseConstructor1.groovy.testCamelCaseConstructor1.completion
diff --git a/...testfiles/completion/ClassMethodFieldLong2.groovy.testClassMethodFieldLong2.21.completion b/...testfiles/completion/ClassMethodFieldLong2.groovy.testClassMethodFieldLong2.21.completion
@@ -0,0 +1,10 @@
+Code completion result for source line:
+longField.comp|
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+METHOD     compare(long, long)             [STATIC,   int
+METHOD     compareTo(Character)                       int
+METHOD     compareTo(Long)                 [PUBLIC]   int
+METHOD     compareTo(Number)                          int
+METHOD     compareUnsigned(long, long)     [STATIC,   int
+METHOD     compress(long, long)            [STATIC,   long
diff --git a/...files/completion/ClassMethodFieldString2.groovy.testClassMethodFieldString2.21.completion b/...files/completion/ClassMethodFieldString2.groovy.testClassMethodFieldString2.21.completion
@@ -0,0 +1,11 @@
+Code completion result for source line:
+stringField.spli|
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+METHOD     split()                                    String[]
+METHOD     split(Closure)                             Collection
+METHOD     split(String)                   [PUBLIC]   String[]
+METHOD     split(String, int)              [PUBLIC]   String[]
+METHOD     splitEachLine(CharSequence, Cl             Object
+METHOD     splitEachLine(Pattern, Closure             Object
+METHOD     splitWithDelimiters(String, in  [PUBLIC]   String[]
diff --git a/...testfiles/completion/ClassMethodLocalLong2.groovy.testClassMethodLocalLong2.21.completion b/...testfiles/completion/ClassMethodLocalLong2.groovy.testClassMethodLocalLong2.21.completion
@@ -0,0 +1,10 @@
+Code completion result for source line:
+localLong.comp|
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+METHOD     compare(long, long)             [STATIC,   int
+METHOD     compareTo(Character)                       int
+METHOD     compareTo(Long)                 [PUBLIC]   int
+METHOD     compareTo(Number)                          int
+METHOD     compareUnsigned(long, long)     [STATIC,   int
+METHOD     compress(long, long)            [STATIC,   long
diff --git a/...st/unit/data/testfiles/completion/ConstructorCall1.groovy.testConstructorCall1.completion b/...st/unit/data/testfiles/completion/ConstructorCall1.groovy.testConstructorCall1.completion
diff --git a/...ata/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion2.completion b/...ata/testfiles/completion/MethodCompletionTestCase.groovy.testMethodCompletion2.completion
@@ -8,10 +8,10 @@ METHOD     find(CharSequence, Closure)                String
 METHOD     find(Closure)                              Object
 METHOD     find(Pattern)                              String
 METHOD     find(Pattern, Closure)                     String
-METHOD     findAll()                                  Collection
+METHOD     findAll()                                  List
 METHOD     findAll(CharSequence)                      List
 METHOD     findAll(CharSequence, Closure)             List
-METHOD     findAll(Closure)                           Collection
+METHOD     findAll(Closure)                           List
 METHOD     findAll(Pattern)                           List
 METHOD     findAll(Pattern, Closure)                  List
 METHOD     findIndexOf(Closure)                       int

diff --git a/...itor/test/unit/data/testfiles/completion/ScriptLong2.groovy.testScriptLong2.21.completion b/...itor/test/unit/data/testfiles/completion/ScriptLong2.groovy.testScriptLong2.21.completion
@@ -0,0 +1,10 @@
+Code completion result for source line:
+l.comp|
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+METHOD     compare(long, long)             [STATIC,   int
+METHOD     compareTo(Character)                       int
+METHOD     compareTo(Long)                 [PUBLIC]   int
+METHOD     compareTo(Number)                          int
+METHOD     compareUnsigned(long, long)     [STATIC,   int
+METHOD     compress(long, long)            [STATIC,   long
diff --git a/.../test/unit/data/testfiles/completion/ScriptString2.groovy.testScriptString2.21.completion b/.../test/unit/data/testfiles/completion/ScriptString2.groovy.testScriptString2.21.completion
@@ -0,0 +1,11 @@
+Code completion result for source line:
+s.spli|
+(QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
+------------------------------------
+METHOD     split()                                    String[]
+METHOD     split(Closure)                             Collection
+METHOD     split(String)                   [PUBLIC]   String[]
+METHOD     split(String, int)              [PUBLIC]   String[]
+METHOD     splitEachLine(CharSequence, Cl             Object
+METHOD     splitEachLine(Pattern, Closure             Object
+METHOD     splitWithDelimiters(String, in  [PUBLIC]   String[]
diff --git a/...ion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion b/...ion/access/basicAccessLevels1/BasicAccessLevels1.groovy.testBasicAccessLevels1.completion
@@ -20,8 +20,8 @@ METHOD     every(Closure)                             boolean
 METHOD     finalize()                      [PROTECTE  void
 METHOD     find()                                     Object
 METHOD     find(Closure)                              Object
-METHOD     findAll()                                  Collection
-METHOD     findAll(Closure)                           Collection
+METHOD     findAll()                                  List
+METHOD     findAll(Closure)                           List
 METHOD     findIndexOf(Closure)                       int
 METHOD     findIndexOf(int, Closure)                  int
 METHOD     findIndexValues(Closure)                   List

diff --git a/...case/camelCaseCompletion2/CamelCaseCompletion2.groovy.testCamelCaseCompletion2.completion b/...case/camelCaseCompletion2/CamelCaseCompletion2.groovy.testCamelCaseCompletion2.completion
@@ -3,4 +3,4 @@ CCTestGClass|^
 (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
 CONSTRUCTO CamelCaseTestGroovyClass() - g             null
 ------------------------------------
-CLASS      CamelCaseTestGroovyClass                   null
+CLASS      CamelCaseTestGroovyClass                   null
diff --git a/...case/camelCaseCompletion3/CamelCaseCompletion3.groovy.testCamelCaseCompletion3.completion b/...case/camelCaseCompletion3/CamelCaseCompletion3.groovy.testCamelCaseCompletion3.completion
@@ -3,4 +3,4 @@ CamelCTGC|^
 (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
 CONSTRUCTO CamelCaseTestGroovyClass() - g             null
 ------------------------------------
-CLASS      CamelCaseTestGroovyClass                   null
+CLASS      CamelCaseTestGroovyClass                   null
diff --git a/...case/camelCaseCompletion4/CamelCaseCompletion4.groovy.testCamelCaseCompletion4.completion b/...case/camelCaseCompletion4/CamelCaseCompletion4.groovy.testCamelCaseCompletion4.completion
@@ -3,4 +3,4 @@ CCT|^
 (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
 CONSTRUCTO CamelCaseTestGroovyClass() - g             null
 ------------------------------------
-CLASS      CamelCaseTestGroovyClass                   null
+CLASS      CamelCaseTestGroovyClass                   null
diff --git a/...case/camelCaseCompletion5/CamelCaseCompletion5.groovy.testCamelCaseCompletion5.completion b/...case/camelCaseCompletion5/CamelCaseCompletion5.groovy.testCamelCaseCompletion5.completion
@@ -3,4 +3,4 @@ CamCa|^
 (QueryType=COMPLETION, prefixSearch=true, caseSensitive=true)
 CONSTRUCTO CamelCaseTestGroovyClass() - g             null
 ------------------------------------
-CLASS      CamelCaseTestGroovyClass                   null
+CLASS      CamelCaseTestGroovyClass                   null