[DO NOT MERGE] SONARPY-2295 Support relative imports in type inference V2

[guillaume-dequenne-sonarsource]

SONARPY-2295

[maksim-grebeniuk-sonarsource]

We could store it as a list of strings

[guillaume-dequenne-sonarsource]

I actually use the string in my other PR to introduce FQNs for FunctionType, so I'd rather keep the string here and split it when needed in the import resolution.

[maksim-grebeniuk-sonarsource]

then this operation makes no sense, but if you prefer to store module name as a single string then this expression could be simpler:

var moduleFqnElements =  List.of(fullyQualifiedModuleName.split("\\."))

[maksim-grebeniuk-sonarsource]

also, does it make sense to define this variable outside of the if condition?

[maksim-grebeniuk-sonarsource]

also if you'll get rid of dotPrefixTokens variable and simply assign the fromModuleFqn - it will allow to get rid of the else part

    var fromModuleFqn = Optional.ofNullable(importFrom.module())
      .map(TrivialTypeInferenceVisitor::dottedNameToPartFqn)
      .orElse(new ArrayList<>());
    var dotPrefixTokens = importFrom.dottedPrefixForModule();
    if (!dotPrefixTokens.isEmpty()) {
      var moduleFqnElements = List.of(fullyQualifiedModuleName.split("\\."));
      // Relative import: we start from the current module FQN and go up as many levels as there are dots in the import statement
      int sizeLimit = Math.max(0, moduleFqnElements.size() - dotPrefixTokens.size());
      fromModuleFqn = Stream.concat(moduleFqnElements.stream().limit(sizeLimit), fromModuleFqn.stream()).toList();
    }
    setTypeToImportFromStatement(importFrom, fromModuleFqn);

[guillaume-dequenne-sonarsource]

That makes sense, thanks!

[maksim-grebeniuk-sonarsource]

Looks good, just a couple of small changes could be applied

[maksim-grebeniuk-sonarsource]

LGTM

[sonarqube-next]

Quality Gate failed

Failed conditions
1 New issue

See analysis details on SonarQube

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

[guillaume-dequenne-sonarsource]

Note: I re-created #2122 to target master instead of the feature branch.

[guillaume-dequenne-sonarsource]

Duplicate.