From 28575a0bebe42811f2933b8cdae13ab4b72c1605 Mon Sep 17 00:00:00 2001 From: Eric Milles Date: Fri, 29 Nov 2019 10:36:45 -0600 Subject: [PATCH] Eclipse 4.14 (RC1) JDT Patch for Groovy-Eclipse: JDT commit 362b8a1 #963 #964 --- .../e414/org.eclipse.jdt.core/antadapter/META-INF/eclipse.inf | 1 - .../org/eclipse/jdt/internal/compiler/lookup/Scope.java | 4 ++++ jdt-patch/e414/org.eclipse.jdt.core/forceQualifierUpdate.txt | 1 + jdt-patch/e414/org.eclipse.jdt.core/readme.txt | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jdt-patch/e414/org.eclipse.jdt.core/antadapter/META-INF/eclipse.inf b/jdt-patch/e414/org.eclipse.jdt.core/antadapter/META-INF/eclipse.inf index 125dc309a5..43380da055 100644 --- a/jdt-patch/e414/org.eclipse.jdt.core/antadapter/META-INF/eclipse.inf +++ b/jdt-patch/e414/org.eclipse.jdt.core/antadapter/META-INF/eclipse.inf @@ -1,3 +1,2 @@ -jarprocessor.exclude.sign=true jarprocessor.exclude.children=true jarprocessor.exclude.pack=true diff --git a/jdt-patch/e414/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java b/jdt-patch/e414/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java index 3b7cd216bb..9165055f2b 100644 --- a/jdt-patch/e414/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java +++ b/jdt-patch/e414/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java @@ -2534,6 +2534,10 @@ public int getDeclarationModifiers(){ MethodScope methodScope = methodScope(); if (!methodScope.isInsideInitializer()){ // check method modifiers to see if deprecated + ReferenceContext ref = methodScope.referenceContext(); + if (ref instanceof ModuleDeclaration) { + return ((ModuleDeclaration)ref).modifiers; + } MethodBinding context = ((AbstractMethodDeclaration)methodScope.referenceContext).binding; if (context != null) return context.modifiers; diff --git a/jdt-patch/e414/org.eclipse.jdt.core/forceQualifierUpdate.txt b/jdt-patch/e414/org.eclipse.jdt.core/forceQualifierUpdate.txt index fa0a0ab832..822526d15a 100644 --- a/jdt-patch/e414/org.eclipse.jdt.core/forceQualifierUpdate.txt +++ b/jdt-patch/e414/org.eclipse.jdt.core/forceQualifierUpdate.txt @@ -6,3 +6,4 @@ Bug 408447 - compiler (log message) needs updating for copyright and bundle_qual Several bundles changed and need to be touched Bug 418646 - org.eclipse.jdt.core does not provide an artifact with classifier 'antadapter' Bug 436266 - Use RC3 (plus) version of JDT compiler to build RC4 +Bug 551547 - The library org.eclipse.jdt.core.compiler.batch_*.jar should be signed \ No newline at end of file diff --git a/jdt-patch/e414/org.eclipse.jdt.core/readme.txt b/jdt-patch/e414/org.eclipse.jdt.core/readme.txt index 8042d67d76..8219fba3f5 100644 --- a/jdt-patch/e414/org.eclipse.jdt.core/readme.txt +++ b/jdt-patch/e414/org.eclipse.jdt.core/readme.txt @@ -1,3 +1,4 @@ 2019-10-12: 0b941e3 (2019-12 M1) 2019-11-09: 3106c52 (2019-12 M2) 2019-11-23: f44d4bd (2019-12 M3) +2019-11-29: 362b8a1 (2019-12 RC1)