d708dc6ed4
Almost in all places only JavaDescriptorResolver was needed. The only exception is JavaPackageScope which needs PsiClassFinder, that is now passed as a constructor argument. Also merge JavaPackageScopeWithoutMembers into its superclass JavaPackageScope