Add appropriate language module as a dependency of a binary module

It is not the current version if the module was compiled with an old compiler Part of #5734
eclipse-archived · Nov 13, 2015 · ba711e5 · ba711e5
1 parent 32d4b52
commit ba711e5
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/model/src/com/redhat/ceylon/model/loader/AbstractModelLoader.java b/model/src/com/redhat/ceylon/model/loader/AbstractModelLoader.java
@@ -2013,9 +2013,29 @@ private boolean loadCompiledModule(Module module, ClassMirror moduleClass, Strin
         Module languageModule = modules.getLanguageModule();
         module.setLanguageModule(languageModule);
         if(!ModelUtil.equalModules(module, languageModule)){
-            ModuleImport moduleImport = moduleManager.findImport(module, languageModule);
-            if (moduleImport == null) {
-                moduleImport = new ModuleImport(languageModule, false, false);
+            boolean found = false;
+            for (ModuleImport mi : module.getImports()) {
+                if ("ceylon.language".equals(mi.getModule().getNameAsString())) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                // It's not really a LazyModule because we're not loading 
+                // it lazily. It's only here for module version analysis.
+                // But other stuff expects non-source modules to be lazy.
+                LazyModule oldLangMod = new LazyModule() {
+                    @Override
+                    protected AbstractModelLoader getModelLoader() {
+                        return AbstractModelLoader.this;
+                    }};
+                oldLangMod.setLanguageModule(oldLangMod);
+                oldLangMod.setName(Arrays.asList("ceylon", "language"));
+                oldLangMod.setVersion("1.1.1");
+                oldLangMod.setNativeBackends(Backends.JAVA);
+                oldLangMod.setMajor(Versions.V1_1_BINARY_MAJOR_VERSION);
+                oldLangMod.setMinor(Versions.V1_1_BINARY_MINOR_VERSION);
+                ModuleImport moduleImport = new ModuleImport(oldLangMod, false, false);
                 module.addImport(moduleImport);
             }
         }