Projects >> groovy-git >>44af10d0fe62cb8ee9c720ea397629444dabba0e

Chunk
Conflicting content 
                            pexp.putNodeMetaData(StaticTypesMarker.READONLY_PROPERTY, Boolean.TRUE);
                            storeType(pexp, getter.getReturnType());
                            return true;
<<<<<<< HEAD
                        }
                        if (pluginFactory!=null) {
                            TypeCheckerPlugin plugin = pluginFactory.getTypeCheckerPlugin(classNode);
                            if (plugin!=null) {
                                PropertyNode result = plugin.resolveProperty(current, propertyName);
                                if (result!=null) {
                                    if (visitor != null) visitor.visitProperty(result);
                                    storeType(pexp, result.getType());
                                    return true;
                                }
                            }
=======
>>>>>>> cc0c82a435ac76a61543c4967683dd9b658636e3
                        }
                        // if the property expression is an attribute expression (o.@attr), then
                        // we stop now, otherwise we must check the parent class
Solution content 
                            pexp.putNodeMetaData(StaticTypesMarker.READONLY_PROPERTY, Boolean.TRUE);
                            storeType(pexp, getter.getReturnType());
                            return true;
                        }
                        if (pluginFactory!=null) {
                            TypeCheckerPlugin plugin = pluginFactory.getTypeCheckerPlugin(classNode);
                            if (plugin!=null) {
                                PropertyNode result = plugin.resolveProperty(current, propertyName);
                                if (result!=null) {
                                    if (visitor != null) visitor.visitProperty(result);
                                    storeType(pexp, result.getType());
                                    return true;
                                }
                            }
                        }
                        // if the property expression is an attribute expression (o.@attr), then
                        // we stop now, otherwise we must check the parent class
File
StaticTypeCheckingVisitor.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
        }

        if (receiver == ClassHelper.GSTRING_TYPE) return findMethod(ClassHelper.STRING_TYPE, name, args);
<<<<<<< HEAD
        
        if (pluginFactory!=null) {
            TypeCheckerPlugin plugin = pluginFactory.getTypeCheckerPlugin(classNode);
            if (plugin!=null) {
                List methodNodes = plugin.findMethod(receiver, name, args);
                if (methodNodes!=null && !methodNodes.isEmpty()) return methodNodes;
            }
        }
        
=======
>>>>>>> cc0c82a435ac76a61543c4967683dd9b658636e3
        return EMPTY_METHODNODE_LIST;
    }
Solution content 
        }

        if (receiver == ClassHelper.GSTRING_TYPE) return findMethod(ClassHelper.STRING_TYPE, name, args);

        if (pluginFactory!=null) {
            TypeCheckerPlugin plugin = pluginFactory.getTypeCheckerPlugin(classNode);
            if (plugin!=null) {
                List methodNodes = plugin.findMethod(receiver, name, args);
                if (methodNodes!=null && !methodNodes.isEmpty()) return methodNodes;
            }
        }
        
        return EMPTY_METHODNODE_LIST;
    }
File
StaticTypeCheckingVisitor.java
Developer's decision
Version 1
Kind of conflict
If statement