equal
deleted
inserted
replaced
390 defaultModule = moduleFinder.findSingleModule(); |
390 defaultModule = moduleFinder.findSingleModule(); |
391 if (defaultModule == syms.unnamedModule) { |
391 if (defaultModule == syms.unnamedModule) { |
392 if (moduleOverride != null) { |
392 if (moduleOverride != null) { |
393 checkNoAllModulePath(); |
393 checkNoAllModulePath(); |
394 defaultModule = moduleFinder.findModule(names.fromString(moduleOverride)); |
394 defaultModule = moduleFinder.findModule(names.fromString(moduleOverride)); |
|
395 defaultModule.sourceLocation = StandardLocation.SOURCE_PATH; |
395 } else { |
396 } else { |
396 // Question: why not do findAllModules and initVisiblePackages here? |
397 // Question: why not do findAllModules and initVisiblePackages here? |
397 // i.e. body of unnamedModuleCompleter |
398 // i.e. body of unnamedModuleCompleter |
398 defaultModule.completer = getUnnamedModuleCompleter(); |
399 defaultModule.completer = getUnnamedModuleCompleter(); |
399 defaultModule.classLocation = StandardLocation.CLASS_PATH; |
400 defaultModule.classLocation = StandardLocation.CLASS_PATH; |
430 rootModules.add(defaultModule); |
431 rootModules.add(defaultModule); |
431 } |
432 } |
432 |
433 |
433 if (defaultModule != syms.unnamedModule) { |
434 if (defaultModule != syms.unnamedModule) { |
434 syms.unnamedModule.completer = getUnnamedModuleCompleter(); |
435 syms.unnamedModule.completer = getUnnamedModuleCompleter(); |
435 syms.unnamedModule.sourceLocation = StandardLocation.SOURCE_PATH; |
436 if (moduleOverride == null) { |
|
437 syms.unnamedModule.sourceLocation = StandardLocation.SOURCE_PATH; |
|
438 } |
436 syms.unnamedModule.classLocation = StandardLocation.CLASS_PATH; |
439 syms.unnamedModule.classLocation = StandardLocation.CLASS_PATH; |
437 } |
440 } |
438 |
441 |
439 for (JCCompilationUnit tree: trees) { |
442 for (JCCompilationUnit tree: trees) { |
440 tree.modle = defaultModule; |
443 tree.modle = defaultModule; |