Projects >> jbehave-eclipse-plugin >>0cb09c331ce9a7ef3521effb5a0744e2dd3c1304

Chunk
Conflicting content 
            };
        });
        
<<<<<<< HEAD
        log.debug("Validating steps");
        
        StepLocator locator = StepLocator.getStepLocator(project);
=======
        final Map> potentials = New.hashMap();
        for (Part part : steps) {
            List list = New.arrayList();
            String stepSentence = part.extractStepSentenceAndRemoveTrailingNewlines();
            log.debug("To analyse: >>" + Strings.escapeNL(stepSentence) + "<<");
            potentials.put(stepSentence, list);
        }

        StepLocator locator = project.getStepLocator();
>>>>>>> 938fa03da485147c79181461a79cc9f8ff52fe21
        locator.traverseSteps(new Visitor() {
            @Override
            public void visit(PotentialStep candidate) {
Solution content 
            };
        });
        
        log.debug("Validating steps");
        
        StepLocator locator = project.getStepLocator();
        locator.traverseSteps(new Visitor() {
            @Override
            public void visit(PotentialStep candidate) {
File
MarkingStoryValidator.java
Developer's decision
Combination
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
            if(isAndCase) {
                StoryPart part = new StoryPartDocumentUtils(localizedStepSupport).findStoryPartAtOffset(document, offset).get();
                JBKeyword kw = part.getPreferredKeyword();
<<<<<<< HEAD
                if(kw == JBKeyword.And) {
                    logger.debug("Autocompletion unable to disambiguate 'And' case: previous story part is probably not a step");
                    return null;
                }
                int indexOf = lineStart.indexOf(' ');
                stepStartUsedForSearch = kw.asString() + lineStart.substring(indexOf);
            }
            
            logger.debug("Autocompletion step start used for search: <{}>", stepStartUsedForSearch);
            
            IProject project = EditorUtils.findProject(viewer);
            Iterable candidateIter = StepLocator.getStepLocator(project).findCandidatesStartingWith(stepStartUsedForSearch);
=======
                int indexOf = localizedStepSupport.lAnd(false).length();
                
                stepStartUsedForSearch = kw.asString(localizedStepSupport.getLocalizedKeywords()) + lineStart.substring(indexOf);
            }
            
            Iterable candidateIter = jbehaveProject.getStepLocator().findCandidatesStartingWith(stepStartUsedForSearch);
>>>>>>> 938fa03da485147c79181461a79cc9f8ff52fe21
            List candidates = Lists.toList(candidateIter);
            Collections.sort(candidates);
            logger.debug("Autocompletion found #{}", candidates.size());
Solution content 
            if(isAndCase) {
                StoryPart part = new StoryPartDocumentUtils(localizedStepSupport).findStoryPartAtOffset(document, offset).get();
                JBKeyword kw = part.getPreferredKeyword();
                if(kw == JBKeyword.And) {
                    logger.debug("Autocompletion unable to disambiguate 'And' case: previous story part is probably not a step");
                    return null;
                }
                int indexOf = localizedStepSupport.lAnd(false).length();
                stepStartUsedForSearch = kw.asString(localizedStepSupport.getLocalizedKeywords()) + lineStart.substring(indexOf);
            }
            
            logger.debug("Autocompletion step start used for search: <{}>", stepStartUsedForSearch);
            
            Iterable candidateIter = jbehaveProject.getStepLocator().findCandidatesStartingWith(stepStartUsedForSearch);
            List candidates = Lists.toList(candidateIter);
            Collections.sort(candidates);
            logger.debug("Autocompletion found #{}", candidates.size());
File
StepContentAssistProcessor.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable