You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/02/22 02:16:45 UTC
[groovy] branch danielsun/tweak-resolving-further updated: Try to
address the bug - 6
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak-resolving-further
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/danielsun/tweak-resolving-further by this push:
new 9786373 Try to address the bug - 6
9786373 is described below
commit 978637358ebed1c624087955f268964609dd2bdf
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Feb 22 10:16:36 2020 +0800
Try to address the bug - 6
---
src/main/java/org/codehaus/groovy/control/ResolveVisitor.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
index bc8f271..d60a34e 100644
--- a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
@@ -638,11 +638,11 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
Map<String, Set<String>> defaultImportClasses = VMPluginFactory.getPlugin().getDefaultImportClasses(DEFAULT_IMPORTS);
DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.putAll(defaultImportClasses);
- Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("Object"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE);
- Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("String"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE);
- Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("File"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE);
- Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("RuntimeException"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE);
- Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("Closure"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE);
+ Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("Object"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.keys());
+ Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("String"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.keys());
+ Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("File"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.keys());
+ Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("RuntimeException"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.keys());
+ Objects.requireNonNull(DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.get("Closure"), "DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE: " + DEFAULT_IMPORT_CLASS_AND_PACKAGES_CACHE.keys());
}
protected boolean resolveFromDefaultImports(final ClassNode type, final String[] packagePrefixes) {