From 12560f8af64009fb2e01ccc1fd4f776b48bc43bd Mon Sep 17 00:00:00 2001 From: Dulaj Date: Fri, 20 Jan 2023 10:26:15 +0530 Subject: [PATCH] Introduce fileName() and deprecate filePath() --- .../configurable/providers/toml/ConfigToml.java | 2 +- .../configurable/providers/toml/Utils.java | 4 ++-- .../api/impl/BallerinaSemanticModel.java | 10 +++++----- .../compiler/api/impl/PositionUtil.java | 2 +- .../compiler/api/impl/ReferenceFinder.java | 2 +- .../api/impl/symbols/BallerinaSymbol.java | 2 +- .../java/io/ballerina/projects/Settings.java | 4 ++-- .../projects/internal/ManifestUtils.java | 4 ++-- .../internal/PackageResolutionDiagnostic.java | 0 .../compiler/BIRPackageSymbolEnter.java | 2 +- .../wso2/ballerinalang/compiler/bir/BIRGen.java | 2 +- .../compiler/bir/codegen/JvmCodeGenUtil.java | 2 +- .../bir/codegen/JvmObservabilityGen.java | 2 +- .../compiler/bir/codegen/JvmPackageGen.java | 6 +++--- .../compiler/bir/codegen/JvmValueGen.java | 6 +++--- .../bir/codegen/methodgen/ConfigMethodGen.java | 2 +- .../bir/codegen/methodgen/FrameClassGen.java | 4 ++-- .../compiler/bir/writer/BIRWriterUtils.java | 4 ++-- .../ballerinalang/compiler/desugar/Desugar.java | 2 +- .../diagnostic/DiagnosticComparator.java | 4 ++-- .../compiler/parser/BLangNodeBuilder.java | 4 ++-- .../semantics/analyzer/DataflowAnalyzer.java | 2 +- .../analyzer/DocumentationAnalyzer.java | 2 +- .../semantics/analyzer/IsolationAnalyzer.java | 2 +- .../analyzer/ReachabilityAnalyzer.java | 2 +- .../semantics/analyzer/SymbolEnter.java | 6 +++--- .../semantics/analyzer/SymbolResolver.java | 8 ++++---- .../semantics/analyzer/TypeChecker.java | 4 ++-- .../compiler/util/diagnotic/DiagnosticPos.java | 8 ++++---- .../internal/diagnostics/SyntaxDiagnostic.java | 2 +- .../test/tree/AbstractSyntaxTreeAPITest.java | 2 +- .../tools/diagnostics/DefaultDiagnostic.java | 2 +- .../ballerina/tools/diagnostics/Diagnostic.java | 2 +- .../java/io/ballerina/tools/text/LineRange.java | 17 +++++++++++------ .../codeactions/test/CodeActionUtils.java | 2 +- .../ModVarToListenerDeclCodeAction.java | 2 +- .../langserver/common/utils/PathUtil.java | 6 +++--- .../contexts/CodeActionContextImpl.java | 2 +- .../diagnostic/DiagnosticsHelper.java | 2 +- .../document/BallerinaDocumentService.java | 2 +- .../document/ExecutorPositionsUtil.java | 4 ++-- .../packages/DocumentComponentTransformer.java | 2 +- .../semantictokens/SemanticTokensVisitor.java | 6 +++--- .../evaluation/utils/EvaluationUtils.java | 2 +- .../PerformanceAnalyzerNodeVisitor.java | 2 +- .../ballerina/semver/checker/SemverChecker.java | 2 +- .../testerina/core/MockAnnotationProcessor.java | 2 +- .../testerina/core/TestProcessor.java | 2 +- .../internal/diagnostics/SyntaxDiagnostic.java | 2 +- .../toml/semantic/ast/TomlTransformer.java | 2 +- .../diagnostics/DiagnosticComparator.java | 4 ++-- .../semantic/diagnostics/TomlDiagnostic.java | 2 +- .../projects/test/TestBuildProject.java | 12 ++++++------ .../projects/test/TestSingleFileProject.java | 2 +- .../semantic/api/test/DocumentationTest.java | 2 +- .../semantic/api/test/SymbolPositionTest.java | 6 +++--- .../semantic/api/test/TypedescriptorTest.java | 2 +- .../org/ballerinalang/test/BAssertUtil.java | 2 +- .../java/org/ballerinalang/test/BRunUtil.java | 2 +- 59 files changed, 105 insertions(+), 100 deletions(-) create mode 100644 compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/PackageResolutionDiagnostic.java diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/ConfigToml.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/ConfigToml.java index 964330e4335e..66323bc6671f 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/ConfigToml.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/ConfigToml.java @@ -71,7 +71,7 @@ private String getErrorMessage(List diagnosticList) { StringBuilder errorMessage = new StringBuilder("\n"); for (Diagnostic diagnostic : diagnosticList) { LineRange lineRange = getOneBasedLineRange(diagnostic.location().lineRange()); - errorMessage.append("[").append(lineRange.filePath()).append(":") + errorMessage.append("[").append(lineRange.fileName()).append(":") .append(lineRange).append("] ").append(diagnostic.message()).append("\n"); } return errorMessage.toString(); diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/Utils.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/Utils.java index 0911fb91b6b8..bc0065295855 100644 --- a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/Utils.java +++ b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/configurable/providers/toml/Utils.java @@ -255,12 +255,12 @@ static String getLineRange(TomlNode node) { return CONFIG_FILE_NAME; } LineRange oneBasedLineRange = getOneBasedLineRange(node.location().lineRange()); - return oneBasedLineRange.filePath() + ":" + oneBasedLineRange; + return oneBasedLineRange.fileName() + ":" + oneBasedLineRange; } static LineRange getOneBasedLineRange(LineRange lineRange) { return LineRange.from( - lineRange.filePath(), + lineRange.fileName(), LinePosition.from(lineRange.startLine().line() + 1, lineRange.startLine().offset() + 1), LinePosition.from(lineRange.endLine().line() + 1, lineRange.endLine().offset() + 1)); } diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BallerinaSemanticModel.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BallerinaSemanticModel.java index 4a049808abf1..6681178e3713 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BallerinaSemanticModel.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BallerinaSemanticModel.java @@ -176,7 +176,7 @@ public Optional symbol(Node node) { return Optional.empty(); } - BLangCompilationUnit compilationUnit = getCompilationUnit(nodeIdentifierLocation.get().lineRange().filePath()); + BLangCompilationUnit compilationUnit = getCompilationUnit(nodeIdentifierLocation.get().lineRange().fileName()); return lookupSymbol(compilationUnit, nodeIdentifierLocation.get().lineRange().startLine()); } @@ -293,7 +293,7 @@ private List getReferences(BSymbol symbol, BLangNode node, boolean wit */ @Override public Optional type(LineRange range) { - BLangCompilationUnit compilationUnit = getCompilationUnit(range.filePath()); + BLangCompilationUnit compilationUnit = getCompilationUnit(range.fileName()); NodeFinder nodeFinder = new NodeFinder(true); BLangNode node = nodeFinder.lookup(compilationUnit, range); @@ -306,7 +306,7 @@ public Optional type(LineRange range) { @Override public Optional typeOf(LineRange range) { - BLangCompilationUnit compilationUnit = getCompilationUnit(range.filePath()); + BLangCompilationUnit compilationUnit = getCompilationUnit(range.fileName()); NodeFinder nodeFinder = new NodeFinder(false); BLangNode node = nodeFinder.lookup(compilationUnit, range); @@ -370,7 +370,7 @@ public List diagnostics(LineRange range) { for (Diagnostic diagnostic : allDiagnostics) { LineRange lineRange = diagnostic.location().lineRange(); - if (lineRange.filePath().equals(range.filePath()) && PositionUtil.withinRange(lineRange, range)) { + if (lineRange.fileName().equals(range.fileName()) && PositionUtil.withinRange(lineRange, range)) { filteredDiagnostics.add(diagnostic); } } @@ -495,7 +495,7 @@ private BLangCompilationUnit getCompilationUnit(String srcFile) { private boolean isCursorNotAtDefinition(BLangCompilationUnit compilationUnit, BSymbol symbolAtCursor, LinePosition cursorPos) { return !(compilationUnit.getPackageID().equals(symbolAtCursor.pkgID) - && compilationUnit.getName().equals(symbolAtCursor.pos.lineRange().filePath()) + && compilationUnit.getName().equals(symbolAtCursor.pos.lineRange().fileName()) && PositionUtil.withinBlock(cursorPos, symbolAtCursor.pos)); } diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/PositionUtil.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/PositionUtil.java index c12c10b9a754..12f9cde16c91 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/PositionUtil.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/PositionUtil.java @@ -71,7 +71,7 @@ static boolean withinRange(LineRange range, LineRange enclRange) { int enclStartOffset = enclRange.startLine().offset(); int enclEndOffset = enclRange.endLine().offset(); - return enclRange.filePath().equals(range.filePath()) + return enclRange.fileName().equals(range.fileName()) && (startLine == enclStartLine && startOffset >= enclStartOffset || startLine > enclStartLine) && (endLine == enclEndLine && endOffset <= enclEndOffset || endLine < enclEndLine); } diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java index 340133e4cad1..38cabb635c60 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java @@ -1429,7 +1429,7 @@ private boolean isGeneratedClassDefForService(BLangClassDefinition clazz) { */ private Location getLocationForLiteral(Location location) { LineRange lineRange = location.lineRange(); - return new BLangDiagnosticLocation(lineRange.filePath(), + return new BLangDiagnosticLocation(lineRange.fileName(), lineRange.startLine().line(), lineRange.endLine().line(), lineRange.startLine().offset() + 1, lineRange.endLine().offset() - 1, location.textRange().startOffset(), location.textRange().length()); diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaSymbol.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaSymbol.java index 77df921ee023..0bd8766412a5 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaSymbol.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/symbols/BallerinaSymbol.java @@ -64,7 +64,7 @@ protected BallerinaSymbol(String name, SymbolKind symbolKind, BSymbol symbol, Co this.internalSymbol = symbol; LineRange lineRange = symbol.pos.lineRange(); TextRange textRange = symbol.pos.textRange(); - this.position = new BLangDiagnosticLocation(lineRange.filePath(), + this.position = new BLangDiagnosticLocation(lineRange.fileName(), lineRange.startLine().line(), lineRange.endLine().line(), lineRange.startLine().offset(), diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Settings.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Settings.java index b5f297f0f0bc..b93a3507d24c 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Settings.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Settings.java @@ -75,12 +75,12 @@ public String getErrorMessage() { private String convertDiagnosticToString(Diagnostic diagnostic) { LineRange lineRange = diagnostic.location().lineRange(); - LineRange oneBasedLineRange = LineRange.from(lineRange.filePath(), LinePosition + LineRange oneBasedLineRange = LineRange.from(lineRange.fileName(), LinePosition .from(lineRange.startLine().line(), lineRange.startLine().offset() + 1), LinePosition .from(lineRange.endLine().line(), lineRange.endLine().offset() + 1)); - return diagnostic.diagnosticInfo().severity().toString() + " [" + oneBasedLineRange.filePath() + ":" + return diagnostic.diagnosticInfo().severity().toString() + " [" + oneBasedLineRange.fileName() + ":" + oneBasedLineRange + "] " + diagnostic.message(); } } diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/ManifestUtils.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/ManifestUtils.java index 63edfde9e205..432ef63dde2e 100644 --- a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/ManifestUtils.java +++ b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/ManifestUtils.java @@ -42,12 +42,12 @@ static String convertDiagnosticToString(Diagnostic diagnostic) { LineRange lineRange = diagnostic.location().lineRange(); LineRange oneBasedLineRange = LineRange.from( - lineRange.filePath(), + lineRange.fileName(), LinePosition.from(lineRange.startLine().line(), lineRange.startLine().offset() + 1), LinePosition.from(lineRange.endLine().line(), lineRange.endLine().offset() + 1)); return diagnostic.diagnosticInfo().severity().toString() + " [" + - oneBasedLineRange.filePath() + ":" + oneBasedLineRange + "] " + diagnostic.message(); + oneBasedLineRange.fileName() + ":" + oneBasedLineRange + "] " + diagnostic.message(); } public static String getStringFromTomlTableNode(TopLevelNode topLevelNode) { diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/PackageResolutionDiagnostic.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/PackageResolutionDiagnostic.java new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/BIRPackageSymbolEnter.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/BIRPackageSymbolEnter.java index 307d8926cdc1..47b3e51986cc 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/BIRPackageSymbolEnter.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/BIRPackageSymbolEnter.java @@ -407,7 +407,7 @@ private void defineFunction(DataInputStream dataInStream) throws IOException { Symbols.createFunctionSymbol(flags, names.fromString(funcName), names.fromString(funcOrigName), this.env.pkgSymbol.pkgID, funcType, this.env.pkgSymbol, Symbols.isFlagOn(flags, Flags.NATIVE), pos, toOrigin(origin)); - invokableSymbol.source = pos.lineRange().filePath(); + invokableSymbol.source = pos.lineRange().fileName(); invokableSymbol.retType = funcType.retType; Scope scopeToDefine = this.env.pkgSymbol.scope; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/BIRGen.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/BIRGen.java index 85ffe203f7c9..92519a4d56ef 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/BIRGen.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/BIRGen.java @@ -1383,7 +1383,7 @@ private BLangDiagnosticLocation getFunctionLastLinePos() { } LineRange lineRange = this.env.enclFunc.pos.lineRange(); LinePosition endLine = lineRange.endLine(); - return new BLangDiagnosticLocation(lineRange.filePath(), endLine.line(), endLine.line(), endLine.offset(), + return new BLangDiagnosticLocation(lineRange.fileName(), endLine.line(), endLine.line(), endLine.offset(), endLine.offset(), 0, 0); } diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmCodeGenUtil.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmCodeGenUtil.java index 1bd8c65b0fba..aa81057f29bd 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmCodeGenUtil.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmCodeGenUtil.java @@ -662,7 +662,7 @@ protected static void generateSetYieldedStatus(MethodVisitor mv, LabelGenerator StringBuilder yieldLocationData = new StringBuilder(fullyQualifiedFuncName); if (terminatorPos != null) { - yieldLocationData.append("(").append(terminatorPos.lineRange().filePath()).append(":") + yieldLocationData.append("(").append(terminatorPos.lineRange().fileName()).append(":") .append(terminatorPos.lineRange().startLine().line() + 1).append(")"); } mv.visitLdcInsn(yieldLocationData.toString()); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmObservabilityGen.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmObservabilityGen.java index e12c03b8bd70..489be4de9bcf 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmObservabilityGen.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmObservabilityGen.java @@ -1062,7 +1062,7 @@ private List generatePositionArgs(BIRPackage pkg, BIRFunction func, Location pos) { BIROperand pkgOperand = generateGlobalConstantOperand(pkg, symbolTable.stringType, generatePackageId(pkg.packageID)); - BIROperand fileNameOperand = getTempLocalVariable(FILE_NAME_STRING, pos, pos.lineRange().filePath(), + BIROperand fileNameOperand = getTempLocalVariable(FILE_NAME_STRING, pos, pos.lineRange().fileName(), symbolTable.stringType, observeStartBB); addLocalVarIfAbsent(func, fileNameOperand.variableDcl); BIROperand startLineOperand = getTempLocalVariable(START_LINE_STRING, pos, diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmPackageGen.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmPackageGen.java index cb898b869adb..3a4baf8da4ce 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmPackageGen.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmPackageGen.java @@ -420,7 +420,7 @@ private void generateModuleClasses(BIRPackage module, Map jarEnt String mainClass = ""; if (mainFunc != null) { mainClass = getModuleLevelClassName(module.packageID, JvmCodeGenUtil - .cleanupPathSeparators(mainFunc.pos.lineRange().filePath())); + .cleanupPathSeparators(mainFunc.pos.lineRange().fileName())); } MainMethodGen mainMethodGen = new MainMethodGen(symbolTable, jvmTypeGen, jvmCastGen, @@ -568,7 +568,7 @@ private void linkModuleFunctions(BIRPackage birPackage, String initClass, boolea // function. BIRFunction initFunc = functions.get(0); String functionName = Utils.encodeFunctionIdentifier(initFunc.name.value); - JavaClass klass = new JavaClass(initFunc.pos.lineRange().filePath()); + JavaClass klass = new JavaClass(initFunc.pos.lineRange().fileName()); klass.functions.add(0, initFunc); PackageID packageID = birPackage.packageID; jvmClassMap.put(initClass, klass); @@ -602,7 +602,7 @@ private void linkModuleFunctions(BIRPackage birPackage, String initClass, boolea if (birFunc.pos == null) { balFileName = MODULE_INIT_CLASS_NAME; } else { - balFileName = birFunc.pos.lineRange().filePath(); + balFileName = birFunc.pos.lineRange().fileName(); } String cleanedBalFileName = balFileName; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmValueGen.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmValueGen.java index 08078f247ac1..93c3f910800f 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmValueGen.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmValueGen.java @@ -246,7 +246,7 @@ private byte[] createRecordTypeDescClass(BRecordType recordType, String classNam ClassWriter cw = new BallerinaClassWriter(COMPUTE_FRAMES); if (typeDef.pos != null) { - cw.visitSource(typeDef.pos.lineRange().filePath(), null); + cw.visitSource(typeDef.pos.lineRange().fileName(), null); } else { cw.visitSource(className, null); } @@ -361,7 +361,7 @@ private byte[] createRecordValueClass(BRecordType recordType, String className, ClassWriter cw = new BallerinaClassWriter(COMPUTE_FRAMES); if (typeDef.pos != null) { - cw.visitSource(typeDef.pos.lineRange().filePath(), null); + cw.visitSource(typeDef.pos.lineRange().fileName(), null); } else { cw.visitSource(className, null); } @@ -598,7 +598,7 @@ private void createRecordPopulateInitialValuesMethod(ClassWriter cw) { private byte[] createObjectValueClass(BObjectType objectType, String className, BIRNode.BIRTypeDefinition typeDef, JvmConstantsGen jvmConstantsGen, AsyncDataCollector asyncDataCollector) { ClassWriter cw = new BallerinaClassWriter(COMPUTE_FRAMES); - cw.visitSource(typeDef.pos.lineRange().filePath(), null); + cw.visitSource(typeDef.pos.lineRange().fileName(), null); SymbolTable symbolTable = jvmPackageGen.symbolTable; JvmTypeGen jvmTypeGen = new JvmTypeGen(jvmConstantsGen, module.packageID, typeHashVisitor, symbolTable); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/methodgen/ConfigMethodGen.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/methodgen/ConfigMethodGen.java index 5d952ecd2596..a958a71e2665 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/methodgen/ConfigMethodGen.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/methodgen/ConfigMethodGen.java @@ -201,7 +201,7 @@ private void populateConfigDataMethod(ClassWriter cw, String moduleClass, private String getOneBasedLocationString(BIRNode.BIRPackage module, Location location) { LineRange lineRange = location.lineRange(); - String oneBasedLineTrace = lineRange.filePath() + ":" + (lineRange.startLine().line() + 1); + String oneBasedLineTrace = lineRange.fileName() + ":" + (lineRange.startLine().line() + 1); if (module.packageID.equals(JvmConstants.DEFAULT)) { return oneBasedLineTrace; } diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/methodgen/FrameClassGen.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/methodgen/FrameClassGen.java index d7b04d1bf35f..3ef5dc0443ff 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/methodgen/FrameClassGen.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/methodgen/FrameClassGen.java @@ -80,8 +80,8 @@ private void generateFrameClassForFunction(PackageID packageID, BIRNode.BIRFunct String frameClassName = MethodGenUtils.getFrameClassName(JvmCodeGenUtil.getPackageName(packageID), func.name.value, attachedType); ClassWriter cw = new BallerinaClassWriter(COMPUTE_FRAMES); - if (func.pos != null && func.pos.lineRange().filePath() != null) { - cw.visitSource(func.pos.lineRange().filePath(), null); + if (func.pos != null && func.pos.lineRange().fileName() != null) { + cw.visitSource(func.pos.lineRange().fileName(), null); } cw.visit(V1_8, Opcodes.ACC_PUBLIC + ACC_SUPER, frameClassName, null, OBJECT, new String[]{FUNCTION_FRAME}); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/writer/BIRWriterUtils.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/writer/BIRWriterUtils.java index 8814b2f4809e..d9727b0f949e 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/writer/BIRWriterUtils.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/writer/BIRWriterUtils.java @@ -58,8 +58,8 @@ public static void writePosition(Location pos, ByteBuf buf, ConstantPool cp) { eLine = pos.lineRange().endLine().line(); sCol = pos.lineRange().startLine().offset(); eCol = pos.lineRange().endLine().offset(); - if (pos.lineRange().filePath() != null) { - sourceFileName = pos.lineRange().filePath(); + if (pos.lineRange().fileName() != null) { + sourceFileName = pos.lineRange().fileName(); } } buf.writeInt(addStringCPEntry(sourceFileName, cp)); diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java index ddbb77c0bfe0..894d1cdee3c0 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java @@ -9031,7 +9031,7 @@ private void addReturnIfNotPresent(BLangInvokableNode invokableNode) { Location invPos = invokableNode.pos; Location returnStmtPos; if (invPos != null && !invokableNode.name.value.contains(GENERATED_INIT_SUFFIX.value)) { - returnStmtPos = new BLangDiagnosticLocation(invPos.lineRange().filePath(), + returnStmtPos = new BLangDiagnosticLocation(invPos.lineRange().fileName(), invPos.lineRange().endLine().line(), invPos.lineRange().endLine().line(), invPos.lineRange().startLine().offset(), diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/DiagnosticComparator.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/DiagnosticComparator.java index 1ff23f19215c..a0f29a8ed9e1 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/DiagnosticComparator.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/diagnostic/DiagnosticComparator.java @@ -46,8 +46,8 @@ public int compare(Diagnostic d1, Diagnostic d2) { // Compare file name // TODO: handle if one is null and other is not - String file1 = lineRange1.filePath(); - String file2 = lineRange2.filePath(); + String file1 = lineRange1.fileName(); + String file2 = lineRange2.fileName(); if (file1 != null && file2 != null) { int fileComparison = file1.compareTo(file2); if (fileComparison != 0) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java index 9f6814fb1fa1..8a262c068650 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/parser/BLangNodeBuilder.java @@ -654,7 +654,7 @@ public BLangNode transform(ModulePartNode modulePart) { compilationUnit.addTopLevelNode((TopLevelNode) member.apply(this)); } - Location newLocation = new BLangDiagnosticLocation(pos.lineRange().filePath(), 0, 0, 0, 0, 0, 0); + Location newLocation = new BLangDiagnosticLocation(pos.lineRange().fileName(), 0, 0, 0, 0, 0, 0); compilationUnit.pos = newLocation; compilationUnit.setPackageID(packageID); @@ -6937,7 +6937,7 @@ private Location expandLeft(Location location, Location upTo) { (location.lineRange().startLine().line() == upTo.lineRange().startLine().line() && location.lineRange().startLine().offset() >= upTo.lineRange().startLine().offset()); - Location expandedLocation = new BLangDiagnosticLocation(location.lineRange().filePath(), + Location expandedLocation = new BLangDiagnosticLocation(location.lineRange().fileName(), upTo.lineRange().startLine().line(), location.lineRange().endLine().line(), upTo.lineRange().startLine().offset(), diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java index 1fa794c64ccd..15294eed0413 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DataflowAnalyzer.java @@ -928,7 +928,7 @@ public void visit(BLangTransaction transactionNode) { // marks the injected import as used Name transactionPkgName = names.fromString(Names.DOT.value + Names.TRANSACTION_PACKAGE.value); - Name compUnitName = names.fromString(transactionNode.pos.lineRange().filePath()); + Name compUnitName = names.fromString(transactionNode.pos.lineRange().fileName()); this.symResolver.resolvePrefixSymbol(env, transactionPkgName, compUnitName); } diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DocumentationAnalyzer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DocumentationAnalyzer.java index 93323fcf82f9..6df42a048afa 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DocumentationAnalyzer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/DocumentationAnalyzer.java @@ -370,7 +370,7 @@ private BSymbol resolveFullyQualifiedSymbol(Location location, SymbolEnv env, St if (pkgName != Names.EMPTY) { BSymbol pkgSymbol = symResolver.resolvePrefixSymbol(env, pkgName, - names.fromString(location.lineRange().filePath())); + names.fromString(location.lineRange().fileName())); if (pkgSymbol == symTable.notFoundSymbol) { return symTable.notFoundSymbol; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsolationAnalyzer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsolationAnalyzer.java index b9f75919d54f..d19121461ad1 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsolationAnalyzer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/IsolationAnalyzer.java @@ -3966,7 +3966,7 @@ private Location getStartLocation(Location location) { LinePosition linePosition = lineRange.startLine(); int startLine = linePosition.line(); int startColumn = linePosition.offset(); - return new BLangDiagnosticLocation(lineRange.filePath(), startLine, startLine, startColumn, startColumn); + return new BLangDiagnosticLocation(lineRange.fileName(), startLine, startLine, startColumn, startColumn); } private DiagnosticHintCode getHintCode(boolean isolatedService, boolean isolatedMethod) { diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ReachabilityAnalyzer.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ReachabilityAnalyzer.java index 5f2e5f715be8..fab21b8f4d62 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ReachabilityAnalyzer.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/ReachabilityAnalyzer.java @@ -582,7 +582,7 @@ public void visit(BLangFunction funcNode, AnalyzerData data) { private Location getEndCharPos(Location pos) { LineRange lineRange = pos.lineRange(); LinePosition endLinePos = lineRange.endLine(); - return new BLangDiagnosticLocation(lineRange.filePath(), endLinePos.line(), endLinePos.line(), + return new BLangDiagnosticLocation(lineRange.fileName(), endLinePos.line(), endLinePos.line(), endLinePos.offset() - 1, endLinePos.offset(), pos.textRange().startOffset() + pos.textRange().length() - 1, 1); } diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java index 9e55df445967..721b82d46238 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolEnter.java @@ -2164,7 +2164,7 @@ public void visit(BLangResourceFunction funcNode) { getFuncSymbolName(funcNode), getFuncSymbolOriginalName(funcNode), env.enclPkg.symbol.pkgID, null, env.scope.owner, funcNode.hasBody(), funcNode.name.pos, SOURCE); - funcSymbol.source = funcNode.pos.lineRange().filePath(); + funcSymbol.source = funcNode.pos.lineRange().fileName(); funcSymbol.markdownDocumentation = getMarkdownDocAttachment(funcNode.markdownDocumentationAttachment); SymbolEnv invokableEnv = SymbolEnv.createFunctionEnv(funcNode, funcSymbol.scope, env); defineInvokableSymbol(funcNode, funcSymbol, invokableEnv); @@ -2204,7 +2204,7 @@ public void visit(BLangFunction funcNode) { env.enclPkg.symbol.pkgID, null, env.scope.owner, funcNode.hasBody(), symbolPos, getOrigin(funcNode.name.value)); - funcSymbol.source = funcNode.pos.lineRange().filePath(); + funcSymbol.source = funcNode.pos.lineRange().fileName(); funcSymbol.markdownDocumentation = getMarkdownDocAttachment(funcNode.markdownDocumentationAttachment); SymbolEnv invokableEnv; NodeKind previousNodeKind = env.node.getKind(); @@ -5500,7 +5500,7 @@ private boolean withinRange(LineRange srcRange, LineRange targetRange) { int enclStartOffset = targetRange.startLine().offset(); int enclEndOffset = targetRange.endLine().offset(); - return targetRange.filePath().equals(srcRange.filePath()) + return targetRange.fileName().equals(srcRange.fileName()) && (startLine == enclStartLine && startOffset >= enclStartOffset || startLine > enclStartLine) && (endLine == enclEndLine && endOffset <= enclEndOffset || endLine < enclEndLine); } diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolResolver.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolResolver.java index fc646314b1b9..9ed8fd1489c1 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolResolver.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolResolver.java @@ -855,7 +855,7 @@ public BSymbol lookupMainSpaceSymbolInPackage(Location pos, // 2) Retrieve the package symbol first BSymbol pkgSymbol = - resolvePrefixSymbol(env, pkgAlias, names.fromString(pos.lineRange().filePath())); + resolvePrefixSymbol(env, pkgAlias, names.fromString(pos.lineRange().fileName())); if (pkgSymbol == symTable.notFoundSymbol) { dlog.error(pos, DiagnosticErrorCode.UNDEFINED_MODULE, pkgAlias.value); return pkgSymbol; @@ -880,7 +880,7 @@ public BSymbol lookupPrefixSpaceSymbolInPackage(Location pos, // 2) Retrieve the package symbol first BSymbol pkgSymbol = - resolvePrefixSymbol(env, pkgAlias, names.fromString(pos.lineRange().filePath())); + resolvePrefixSymbol(env, pkgAlias, names.fromString(pos.lineRange().fileName())); if (pkgSymbol == symTable.notFoundSymbol) { dlog.error(pos, DiagnosticErrorCode.UNDEFINED_MODULE, pkgAlias.value); return pkgSymbol; @@ -901,7 +901,7 @@ public BSymbol lookupAnnotationSpaceSymbolInPackage(Location pos, // 2) Retrieve the package symbol first BSymbol pkgSymbol = - resolvePrefixSymbol(env, pkgAlias, names.fromString(pos.lineRange().filePath())); + resolvePrefixSymbol(env, pkgAlias, names.fromString(pos.lineRange().fileName())); if (pkgSymbol == symTable.notFoundSymbol) { dlog.error(pos, DiagnosticErrorCode.UNDEFINED_MODULE, pkgAlias.value); return pkgSymbol; @@ -922,7 +922,7 @@ public BSymbol lookupConstructorSpaceSymbolInPackage(Location pos, // 2) Retrieve the package symbol first BSymbol pkgSymbol = - resolvePrefixSymbol(env, pkgAlias, names.fromString(pos.lineRange().filePath())); + resolvePrefixSymbol(env, pkgAlias, names.fromString(pos.lineRange().fileName())); if (pkgSymbol == symTable.notFoundSymbol) { dlog.error(pos, DiagnosticErrorCode.UNDEFINED_MODULE, pkgAlias.value); return pkgSymbol; diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java index 70597e942c80..e0c9039d36b3 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java @@ -2441,7 +2441,7 @@ private BType getEffectiveMappingType(BLangRecordLiteral recordLiteral, BType ap BLangUserDefinedType origTypeRef = new BLangUserDefinedType( ASTBuilderUtil.createIdentifier( pos, - TypeDefBuilderHelper.getPackageAlias(data.env, pos.lineRange().filePath(), + TypeDefBuilderHelper.getPackageAlias(data.env, pos.lineRange().fileName(), applicableRecordTypeSymbol.pkgID)), ASTBuilderUtil.createIdentifier(pos, applicableRecordTypeSymbol.name.value)); origTypeRef.pos = pos; @@ -9636,7 +9636,7 @@ private boolean isConstExpr(BLangExpression expression) { } private Name getCurrentCompUnit(BLangNode node) { - return names.fromString(node.pos.lineRange().filePath()); + return names.fromString(node.pos.lineRange().fileName()); } diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/diagnotic/DiagnosticPos.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/diagnotic/DiagnosticPos.java index 79248d44fccb..8b015632e7ee 100644 --- a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/diagnotic/DiagnosticPos.java +++ b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/util/diagnotic/DiagnosticPos.java @@ -86,24 +86,24 @@ public boolean equals(Object obj) { } DiagnosticPos diagnosticPos = (DiagnosticPos) obj; return packageID.equals(diagnosticPos.getPackageID()) && - lineRange().filePath().equals(diagnosticPos.lineRange().filePath()) && + lineRange().fileName().equals(diagnosticPos.lineRange().fileName()) && (getStartLine() == diagnosticPos.getStartLine() && getEndLine() == diagnosticPos.getEndLine() && getStartColumn() == diagnosticPos.getStartColumn() && getEndColumn() == diagnosticPos.getEndColumn()); } @Override public int hashCode() { - return packageID.hashCode() + lineRange().filePath().hashCode() + + return packageID.hashCode() + lineRange().fileName().hashCode() + getStartLine() + getEndLine() + getStartColumn() + getEndColumn(); } public int compareTo(DiagnosticPos diagnosticPosition) { // Compare the source first. - String thisDiagnosticString = packageID.name.value + packageID.version.value + lineRange().filePath(); + String thisDiagnosticString = packageID.name.value + packageID.version.value + lineRange().fileName(); String otherDiagnosticString = diagnosticPosition.getPackageID().name.value + diagnosticPosition.getPackageID().version.value + - diagnosticPosition.lineRange().filePath(); + diagnosticPosition.lineRange().fileName(); int value = thisDiagnosticString.compareTo(otherDiagnosticString); if (value != 0) { diff --git a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/diagnostics/SyntaxDiagnostic.java b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/diagnostics/SyntaxDiagnostic.java index 866f2e20f8b9..1ae9489efe9b 100644 --- a/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/diagnostics/SyntaxDiagnostic.java +++ b/compiler/ballerina-parser/src/main/java/io/ballerina/compiler/internal/diagnostics/SyntaxDiagnostic.java @@ -80,6 +80,6 @@ public List> properties() { @Override public String toString() { return diagnosticInfo().severity().toString() + " [" + - location().lineRange().filePath() + ":" + location().lineRange() + "] " + message(); + location().lineRange().fileName() + ":" + location().lineRange() + "] " + message(); } } diff --git a/compiler/ballerina-parser/src/test/java/io/ballerinalang/compiler/parser/test/tree/AbstractSyntaxTreeAPITest.java b/compiler/ballerina-parser/src/test/java/io/ballerinalang/compiler/parser/test/tree/AbstractSyntaxTreeAPITest.java index 451d09b9a491..e04713b94286 100644 --- a/compiler/ballerina-parser/src/test/java/io/ballerinalang/compiler/parser/test/tree/AbstractSyntaxTreeAPITest.java +++ b/compiler/ballerina-parser/src/test/java/io/ballerinalang/compiler/parser/test/tree/AbstractSyntaxTreeAPITest.java @@ -60,7 +60,7 @@ protected Path getPath(Path filePath) { } protected void assertLineRange(LineRange actualLineRange, LineRange expectedLineRange) { - Assert.assertEquals(actualLineRange.filePath(), expectedLineRange.filePath()); + Assert.assertEquals(actualLineRange.fileName(), expectedLineRange.fileName()); Assert.assertEquals(actualLineRange.startLine(), expectedLineRange.startLine()); Assert.assertEquals(actualLineRange.endLine(), expectedLineRange.endLine()); } diff --git a/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/diagnostics/DefaultDiagnostic.java b/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/diagnostics/DefaultDiagnostic.java index 46ee8bcfd3ab..1123b25445fb 100644 --- a/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/diagnostics/DefaultDiagnostic.java +++ b/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/diagnostics/DefaultDiagnostic.java @@ -68,7 +68,7 @@ public List> properties() { @Override public String toString() { LineRange lineRange = this.location.lineRange(); - String filePath = lineRange.filePath(); + String filePath = lineRange.fileName(); LineRange oneBasedLineRange = LineRange.from( filePath, LinePosition.from(lineRange.startLine().line() + 1, lineRange.startLine().offset() + 1), diff --git a/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/diagnostics/Diagnostic.java b/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/diagnostics/Diagnostic.java index c47bedb5ddc0..ffe2250e4cd9 100644 --- a/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/diagnostics/Diagnostic.java +++ b/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/diagnostics/Diagnostic.java @@ -57,6 +57,6 @@ public abstract class Diagnostic { @Override public String toString() { return diagnosticInfo().severity().toString() + " [" + - location().lineRange().filePath() + ":" + location().lineRange() + "] " + message(); + location().lineRange().fileName() + ":" + location().lineRange() + "] " + message(); } } diff --git a/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/text/LineRange.java b/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/text/LineRange.java index 2623f7ab6c71..08c6fd9336d5 100644 --- a/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/text/LineRange.java +++ b/compiler/ballerina-tools-api/src/main/java/io/ballerina/tools/text/LineRange.java @@ -25,22 +25,27 @@ * @since 2.0.0 */ public class LineRange { - private final String filePath; + private final String fileName; private final LinePosition startLine; private final LinePosition endLine; - private LineRange(String filePath, LinePosition startLine, LinePosition endLine) { - this.filePath = filePath; + private LineRange(String fileName, LinePosition startLine, LinePosition endLine) { + this.fileName = fileName; this.startLine = startLine; this.endLine = endLine; } - public static LineRange from(String filePath, LinePosition startLine, LinePosition endLine) { - return new LineRange(filePath, startLine, endLine); + public static LineRange from(String fileName, LinePosition startLine, LinePosition endLine) { + return new LineRange(fileName, startLine, endLine); } + @Deprecated public String filePath() { - return filePath; + return fileName; + } + + public String fileName() { + return fileName; } public LinePosition startLine() { diff --git a/compiler/linter-plugin/src/test/java/io/ballerina/compiler/linter/codeactions/test/CodeActionUtils.java b/compiler/linter-plugin/src/test/java/io/ballerina/compiler/linter/codeactions/test/CodeActionUtils.java index 9a2befd4d3fa..4e89e10dd7f6 100644 --- a/compiler/linter-plugin/src/test/java/io/ballerina/compiler/linter/codeactions/test/CodeActionUtils.java +++ b/compiler/linter-plugin/src/test/java/io/ballerina/compiler/linter/codeactions/test/CodeActionUtils.java @@ -70,7 +70,7 @@ public static List getCodeActions(Project project, Path filePath return compilation.diagnosticResult().diagnostics().stream() // Filter diagnostics available for the cursor position .filter(diagnostic -> isWithinRange(diagnostic.location().lineRange(), cursorPos) && - filePath.endsWith(diagnostic.location().lineRange().filePath())) + filePath.endsWith(diagnostic.location().lineRange().fileName())) .flatMap(diagnostic -> { CodeActionContextImpl context = CodeActionContextImpl.from( filePath.toUri().toString(), diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/codeaction/providers/ModVarToListenerDeclCodeAction.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/codeaction/providers/ModVarToListenerDeclCodeAction.java index b71f6831ed8b..c7ef4daaedfe 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/codeaction/providers/ModVarToListenerDeclCodeAction.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/codeaction/providers/ModVarToListenerDeclCodeAction.java @@ -113,7 +113,7 @@ private Optional> findCaptureBindingPatt } Path filePath = project.get().sourceRoot() .resolve("modules").resolve(symbol.get().getModule().get().id().modulePrefix()) - .resolve(location.get().lineRange().filePath()); + .resolve(location.get().lineRange().fileName()); Optional syntaxTree = context.workspace().syntaxTree(filePath); if (syntaxTree.isEmpty()) { return Optional.empty(); diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/common/utils/PathUtil.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/common/utils/PathUtil.java index 619c9c77b15c..c802fa6f8eb2 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/common/utils/PathUtil.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/common/utils/PathUtil.java @@ -160,7 +160,7 @@ public static Optional getFilePathForSymbol(Symbol symbol, Project project Collection dependencies = project.currentPackage().getResolution().dependencyGraph().getNodes(); // Symbol location has only the name of the file - String sourceFile = symbol.getLocation().get().lineRange().filePath(); + String sourceFile = symbol.getLocation().get().lineRange().fileName(); for (ResolvedPackageDependency depNode : dependencies) { // Check for matching dependency Package depPackage = depNode.packageInstance(); @@ -204,7 +204,7 @@ private static Optional getFilePathForLanglibSymbol(Project project, Symbo return Optional.empty(); } Package langLibPackage = langLibPackages.get(0); - String sourceFile = symbol.getLocation().get().lineRange().filePath(); + String sourceFile = symbol.getLocation().get().lineRange().fileName(); Optional filepath = Optional.empty(); for (ModuleId moduleId : langLibPackage.moduleIds()) { @@ -257,7 +257,7 @@ public static String getUriFromLocation(Module module, Location location) { * @return file path */ public static Path getPathFromLocation(Module module, Location location) { - String filePath = location.lineRange().filePath(); + String filePath = location.lineRange().fileName(); if (module.project().kind() == ProjectKind.SINGLE_FILE_PROJECT) { return module.project().sourceRoot(); diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/CodeActionContextImpl.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/CodeActionContextImpl.java index 4db33b0944b1..6b31debded18 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/CodeActionContextImpl.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/contexts/CodeActionContextImpl.java @@ -106,7 +106,7 @@ public List diagnostics(Path filePath ? project.sourceRoot().getParent() : project.sourceRoot(); this.diagnostics = compilation.diagnosticResult().diagnostics().stream() - .filter(diag -> projectRoot.resolve(diag.location().lineRange().filePath()).equals(filePath)) + .filter(diag -> projectRoot.resolve(diag.location().lineRange().fileName()).equals(filePath)) .collect(Collectors.toList()); return this.diagnostics; } diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/diagnostic/DiagnosticsHelper.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/diagnostic/DiagnosticsHelper.java index d18cd0ce0c0e..890e269c3347 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/diagnostic/DiagnosticsHelper.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/diagnostic/DiagnosticsHelper.java @@ -238,7 +238,7 @@ private Map> toDiagnosticsMap(Collection syntaxTreeByName(Ballerina } // Get the file path of the function symbol - String functionPath = functionSymbol.get().getLocation().get().lineRange().filePath(); + String functionPath = functionSymbol.get().getLocation().get().lineRange().fileName(); // Get the project of current file Optional project = workspaceManager.project(filePath.get()); diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/ExecutorPositionsUtil.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/ExecutorPositionsUtil.java index b606f19e73cd..7ab98ae7437f 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/ExecutorPositionsUtil.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/document/ExecutorPositionsUtil.java @@ -107,7 +107,7 @@ public static JsonArray getExecutorPositions(WorkspaceManager workspaceManager, if (defaultModuleFunctionList.get(0).getLocation().isPresent()) { Location location = defaultModuleFunctionList.get(0).getLocation().get(); mainFunctionObject.add(RANGE, GSON.toJsonTree(location.lineRange())); - mainFunctionObject.addProperty(FILE_PATH, location.lineRange().filePath()); + mainFunctionObject.addProperty(FILE_PATH, location.lineRange().fileName()); } execPositions.add(mainFunctionObject); } @@ -130,7 +130,7 @@ public static JsonArray getExecutorPositions(WorkspaceManager workspaceManager, if (serviceSymbol.getLocation().isPresent()) { Location location = serviceSymbol.getLocation().get(); serviceObject.add(RANGE, GSON.toJsonTree(location.lineRange())); - serviceObject.addProperty(FILE_PATH, location.lineRange().filePath()); + serviceObject.addProperty(FILE_PATH, location.lineRange().fileName()); } Optional serviceAttachPoint = serviceSymbol.attachPoint(); if (serviceAttachPoint.isPresent()) { diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/DocumentComponentTransformer.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/DocumentComponentTransformer.java index 4e0643a259b7..ead61e0c1dd2 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/DocumentComponentTransformer.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/extensions/ballerina/packages/DocumentComponentTransformer.java @@ -132,7 +132,7 @@ public Optional transform(EnumDeclarationNode enumDeclarationNode) */ private DataObject createDataObject(String name, Node node) { LineRange lineRange = node.lineRange(); - return new DataObject(name, lineRange.filePath(), lineRange.startLine().line(), lineRange.startLine().offset(), + return new DataObject(name, lineRange.fileName(), lineRange.startLine().line(), lineRange.startLine().offset(), lineRange.endLine().line(), lineRange.endLine().offset()); } } diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/semantictokens/SemanticTokensVisitor.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/semantictokens/SemanticTokensVisitor.java index 5cff15fd0b49..61196e1deb40 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/semantictokens/SemanticTokensVisitor.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/semantictokens/SemanticTokensVisitor.java @@ -600,7 +600,7 @@ private void processSymbols(Node node, LinePosition startLine) { if (declarationType != -1) { Optional moduleSymbol = symbol.get().getModule(); // Add the symbol's semantic token if it is in the same file - if (symbolLineRange.filePath().equals(this.semanticTokensContext.currentDocument().get().name()) && + if (symbolLineRange.fileName().equals(this.semanticTokensContext.currentDocument().get().name()) && moduleSymbol.isPresent() && moduleSymbol.get().getName().isPresent() && this.semanticTokensContext.currentModule().isPresent() && moduleSymbol.get().getName().get() .equals(this.semanticTokensContext.currentModule().get().moduleId().moduleName())) { @@ -620,7 +620,7 @@ private void processSymbols(Node node, LinePosition startLine) { List locations = semanticModel.get().references(symbol.get(), this.semanticTokensContext.currentDocument().get(), false); - locations.stream().filter(location -> location.lineRange().filePath() + locations.stream().filter(location -> location.lineRange().fileName() .equals(this.semanticTokensContext.currentDocument().get().name())).forEach(location -> { LinePosition position = location.lineRange().startLine(); SemanticToken semanticToken = new SemanticToken(position.line(), position.offset()); @@ -674,7 +674,7 @@ private void handleReferences(LinePosition linePosition, int length, int type, i List locations = semanticModel.get().references(document, document, linePosition, false); locations.stream().filter(location -> - location.lineRange().filePath().equals(document.name())).forEach(location -> { + location.lineRange().fileName().equals(document.name())).forEach(location -> { LinePosition position = location.lineRange().startLine(); SemanticToken semanticToken = new SemanticToken(position.line(), position.offset()); if (!semanticTokens.contains(semanticToken) && location.textRange().length() == length) { diff --git a/misc/debug-adapter/modules/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/evaluation/utils/EvaluationUtils.java b/misc/debug-adapter/modules/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/evaluation/utils/EvaluationUtils.java index 1cc4e51bd3b1..1a751a496159 100644 --- a/misc/debug-adapter/modules/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/evaluation/utils/EvaluationUtils.java +++ b/misc/debug-adapter/modules/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/evaluation/utils/EvaluationUtils.java @@ -496,7 +496,7 @@ public static Value getAsBString(SuspendedContext context, StringReference strin * @return the fully-qualified generated java class name for the source file, which includes the given symbol */ public static String constructQualifiedClassName(Symbol symbol) { - String className = symbol.getLocation().orElseThrow().lineRange().filePath().replaceAll(BAL_FILE_EXT + "$", ""); + String className = symbol.getLocation().orElseThrow().lineRange().fileName().replaceAll(BAL_FILE_EXT + "$", ""); if (symbol.getModule().isEmpty()) { return className; } diff --git a/misc/ls-extensions/modules/performance-analyzer-services/src/main/java/io/ballerina/PerformanceAnalyzerNodeVisitor.java b/misc/ls-extensions/modules/performance-analyzer-services/src/main/java/io/ballerina/PerformanceAnalyzerNodeVisitor.java index b382673dcd65..e219e025e55a 100644 --- a/misc/ls-extensions/modules/performance-analyzer-services/src/main/java/io/ballerina/PerformanceAnalyzerNodeVisitor.java +++ b/misc/ls-extensions/modules/performance-analyzer-services/src/main/java/io/ballerina/PerformanceAnalyzerNodeVisitor.java @@ -469,7 +469,7 @@ private void resolveActionInvocation(RemoteMethodCallActionNode remoteMethodCall if (withinWorker) { isWorkersHaveConnectorCalls = true; } - String pos = actionPos.filePath() + "/" + actionPos; + String pos = actionPos.fileName() + "/" + actionPos; ActionInvocationNode actionNode; if (addReturnNode) { actionNode = new ReturningActionInvocationNode(getUUID(lineRange), diff --git a/misc/semver-checker/modules/semver-checker-core/src/main/java/io/ballerina/semver/checker/SemverChecker.java b/misc/semver-checker/modules/semver-checker-core/src/main/java/io/ballerina/semver/checker/SemverChecker.java index d9262dc599b0..34bd005d6923 100644 --- a/misc/semver-checker/modules/semver-checker-core/src/main/java/io/ballerina/semver/checker/SemverChecker.java +++ b/misc/semver-checker/modules/semver-checker-core/src/main/java/io/ballerina/semver/checker/SemverChecker.java @@ -128,7 +128,7 @@ private void loadCurrentPackage() throws SemverToolException { // Ignores .toml diagnostics as we consider source code compatibility. // Todo - support toml changes validation List srcErrors = compilation.diagnosticResult().errors().stream() - .filter(diagnostic -> diagnostic.location().lineRange().filePath().endsWith(BAL_FILE_EXT)) + .filter(diagnostic -> diagnostic.location().lineRange().fileName().endsWith(BAL_FILE_EXT)) .collect(Collectors.toList()); if (srcErrors.isEmpty()) { return; diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/MockAnnotationProcessor.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/MockAnnotationProcessor.java index f95c9747fa01..8e9338bb2548 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/MockAnnotationProcessor.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/MockAnnotationProcessor.java @@ -446,7 +446,7 @@ private String getClassName(BPackageSymbol bPackageSymbol, Location pos) { bPackageSymbol.pkgID.orgName.getValue(), bPackageSymbol.pkgID.name.getValue(), bPackageSymbol.pkgID.version.getValue(), - pos.lineRange().filePath() + pos.lineRange().fileName() .replace(ProjectConstants.BLANG_SOURCE_EXT, "") .replace(ProjectConstants.DOT, FILE_NAME_PERIOD_SEPARATOR) .replace("/", ProjectConstants.DOT)); diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java index 9da1c8326c8c..3bf6b3a9ab86 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/core/TestProcessor.java @@ -331,7 +331,7 @@ private void addUtilityFunctions(Module module, TestSuite testSuite) { PackageID moduleTestCompilationId = module.descriptor().moduleTestCompilationId(); String testModuleName = testable ? moduleTestCompilationId.name.value + Names.TEST_PACKAGE : moduleTestCompilationId.name.value; - String className = pos.lineRange().filePath() + String className = pos.lineRange().fileName() .replace(ProjectConstants.BLANG_SOURCE_EXT, "") .replace(ProjectConstants.DOT, FILE_NAME_PERIOD_SEPARATOR) .replace("/", ProjectConstants.DOT); diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/internal/diagnostics/SyntaxDiagnostic.java b/misc/toml-parser/src/main/java/io/ballerina/toml/internal/diagnostics/SyntaxDiagnostic.java index 934fb4b1d2aa..8fea7b99cde0 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/internal/diagnostics/SyntaxDiagnostic.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/internal/diagnostics/SyntaxDiagnostic.java @@ -80,6 +80,6 @@ public List> properties() { @Override public String toString() { return diagnosticInfo().severity().toString() + " [" + - location().lineRange().filePath() + ":" + location().lineRange() + "] " + message(); + location().lineRange().fileName() + ":" + location().lineRange() + "] " + message(); } } diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/ast/TomlTransformer.java b/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/ast/TomlTransformer.java index a1ed5e5f3329..0230ab381891 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/ast/TomlTransformer.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/ast/TomlTransformer.java @@ -629,7 +629,7 @@ private TomlNodeLocation getTomlNodeListLocation(List tomlNo } TextRange textRange = TextRange.from(firstKeyLocation.textRange().startOffset(), length - 1); LineRange lineRange = LineRange.from( - firstKeyLocation.lineRange().filePath(), + firstKeyLocation.lineRange().fileName(), firstKeyLocation.lineRange().startLine(), tomlNodes.get(tomlNodes.size() - 1).location().lineRange().endLine()); return new TomlNodeLocation(lineRange, textRange); diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/diagnostics/DiagnosticComparator.java b/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/diagnostics/DiagnosticComparator.java index 68a5cca311d0..64bb83dc5e90 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/diagnostics/DiagnosticComparator.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/diagnostics/DiagnosticComparator.java @@ -47,8 +47,8 @@ public int compare(Diagnostic d1, Diagnostic d2) { // Compare file name // TODO: handle if one is null and other is not - String file1 = lineRange1.filePath(); - String file2 = lineRange2.filePath(); + String file1 = lineRange1.fileName(); + String file2 = lineRange2.fileName(); if (file1 != null && file2 != null) { int fileComparison = file1.compareTo(file2); if (fileComparison != 0) { diff --git a/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/diagnostics/TomlDiagnostic.java b/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/diagnostics/TomlDiagnostic.java index e679d11ea08c..71d7e1a58c21 100644 --- a/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/diagnostics/TomlDiagnostic.java +++ b/misc/toml-parser/src/main/java/io/ballerina/toml/semantic/diagnostics/TomlDiagnostic.java @@ -86,7 +86,7 @@ public int hashCode() { @Override public String toString() { - String filePath = this.location().lineRange().filePath(); + String filePath = this.location().lineRange().fileName(); LineRange lineRange = this.location().lineRange(); LineRange oneBasedLineRange = LineRange.from( diff --git a/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestBuildProject.java b/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestBuildProject.java index 099a34a1c5bc..b698d2c3b053 100644 --- a/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestBuildProject.java +++ b/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestBuildProject.java @@ -298,7 +298,7 @@ public void testDiagnostics() { // Verify paths in packageCompilation diagnostics List diagnosticFilePaths = compilation.diagnosticResult().diagnostics().stream().map(diagnostic -> - diagnostic.location().lineRange().filePath()).distinct().collect(Collectors.toList()); + diagnostic.location().lineRange().fileName()).distinct().collect(Collectors.toList()); for (String path : expectedPaths) { Assert.assertTrue(diagnosticFilePaths.contains(path), diagnosticFilePaths.toString()); @@ -313,7 +313,7 @@ public void testDiagnostics() { // Verify paths in jBallerina backend diagnostics diagnosticFilePaths = jBallerinaBackend.diagnosticResult().diagnostics().stream().map(diagnostic -> - diagnostic.location().lineRange().filePath()).distinct().collect(Collectors.toList()); + diagnostic.location().lineRange().fileName()).distinct().collect(Collectors.toList()); for (String path : expectedPaths) { Assert.assertTrue(diagnosticFilePaths.contains(path), diagnosticFilePaths.toString()); @@ -1241,7 +1241,7 @@ public void testEditDependantModuleDocument() { PackageCompilation compilation1 = project.currentPackage().getCompilation(); DiagnosticResult diagnosticResult = compilation1.diagnosticResult(); Assert.assertEquals(diagnosticResult.diagnosticCount(), 1); - Assert.assertEquals(diagnosticResult.diagnostics().stream().findAny().get().location().lineRange().filePath(), + Assert.assertEquals(diagnosticResult.diagnostics().stream().findAny().get().location().lineRange().fileName(), "main.bal"); Assert.assertTrue(diagnosticResult.diagnostics().stream().findAny().get().message() .contains("missing required parameter 'c'")); @@ -1268,7 +1268,7 @@ public void testRemoveDependantModuleDocument() { PackageCompilation compilation1 = project.currentPackage().getCompilation(); DiagnosticResult diagnosticResult = compilation1.diagnosticResult(); Assert.assertEquals(diagnosticResult.diagnosticCount(), 1); - Assert.assertEquals(diagnosticResult.diagnostics().stream().findAny().get().location().lineRange().filePath(), + Assert.assertEquals(diagnosticResult.diagnostics().stream().findAny().get().location().lineRange().fileName(), "main.bal"); Assert.assertTrue(diagnosticResult.diagnostics().stream().findAny().get().message() .contains("undefined function 'concatStrings'")); @@ -1300,7 +1300,7 @@ public void testEditTransitivelyDependantModuleDocument() { DiagnosticResult diagnosticResult = compilation1.diagnosticResult(); Assert.assertEquals(diagnosticResult.diagnosticCount(), 1); - Assert.assertEquals(diagnosticResult.diagnostics().stream().findAny().get().location().lineRange().filePath(), + Assert.assertEquals(diagnosticResult.diagnostics().stream().findAny().get().location().lineRange().fileName(), Paths.get("modules").resolve("schema").resolve("schema.bal").toString()); Assert.assertTrue(diagnosticResult.diagnostics().stream().findAny().get().message() .contains("unknown type 'PersonalDetails'")); @@ -2185,7 +2185,7 @@ public void testDocumentsOrder() { PackageCompilation compilation = currentPackage.getCompilation(); List actualDiagnosticPaths = compilation.diagnosticResult().diagnostics().stream().map(diagnostic -> - diagnostic.location().lineRange().filePath()).distinct().collect(Collectors.toList()); + diagnostic.location().lineRange().fileName()).distinct().collect(Collectors.toList()); List expectedDiagnosticPaths = Arrays.asList( "main.bal", Paths.get("tests").resolve("main_test.bal").toString(), diff --git a/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestSingleFileProject.java b/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestSingleFileProject.java index 823e7384be19..5af5905767d3 100644 --- a/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestSingleFileProject.java +++ b/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestSingleFileProject.java @@ -253,7 +253,7 @@ public void testDiagnostics() { Assert.assertEquals( compilation.diagnosticResult().diagnostics().stream().findFirst().get().location().lineRange() - .filePath(), "main_with_error.bal"); + .fileName(), "main_with_error.bal"); } @Test diff --git a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/DocumentationTest.java b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/DocumentationTest.java index f2e9162fc7c5..48d86cb69f3b 100644 --- a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/DocumentationTest.java +++ b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/DocumentationTest.java @@ -186,7 +186,7 @@ public void testDocSymbolPositions(int sLine, int sCol, String expSymbolName, in assertTrue(symbol.get().getLocation().isPresent()); Location pos = symbol.get().getLocation().get(); - assertEquals(pos.lineRange().filePath(), "documentation_symbol_position_test.bal"); + assertEquals(pos.lineRange().fileName(), "documentation_symbol_position_test.bal"); assertEquals(pos.lineRange().startLine().line(), defSLine); assertEquals(pos.lineRange().startLine().offset(), defSCol); assertEquals(pos.lineRange().endLine().line(), defELine); diff --git a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/SymbolPositionTest.java b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/SymbolPositionTest.java index db52a5776f1c..20b297a2f805 100644 --- a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/SymbolPositionTest.java +++ b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/SymbolPositionTest.java @@ -68,7 +68,7 @@ public void testSymbolPositions(int sLine, int sCol, int eLine, int eCol, String assertTrue(symbol.get().getLocation().isPresent()); Location pos = symbol.get().getLocation().get(); - assertEquals(pos.lineRange().filePath(), "symbol_position_test.bal"); + assertEquals(pos.lineRange().fileName(), "symbol_position_test.bal"); assertEquals(pos.lineRange().startLine().line(), sLine); assertEquals(pos.lineRange().startLine().offset(), sCol); assertEquals(pos.lineRange().endLine().line(), eLine); @@ -102,7 +102,7 @@ public void testTypeNarrowedSymbolPositions(int line, int col) { assertEquals(symbol.get().getName().get(), "val"); Location pos = symbol.get().getLocation().get(); - assertEquals(pos.lineRange().filePath(), "symbol_position_test.bal"); + assertEquals(pos.lineRange().fileName(), "symbol_position_test.bal"); assertEquals(pos.lineRange().startLine().line(), 60); assertEquals(pos.lineRange().startLine().offset(), 21); assertEquals(pos.lineRange().endLine().line(), 60); @@ -135,7 +135,7 @@ public void testTypeDefPositions(int sLine, int sCol, String expSymbolName, int assertTrue(symbol.get().getLocation().isPresent()); Location pos = symbol.get().getLocation().get(); - assertEquals(pos.lineRange().filePath(), "symbol_position_test.bal"); + assertEquals(pos.lineRange().fileName(), "symbol_position_test.bal"); assertEquals(pos.lineRange().startLine().line(), defSLine); assertEquals(pos.lineRange().startLine().offset(), defSCol); assertEquals(pos.lineRange().endLine().line(), defELine); diff --git a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/TypedescriptorTest.java b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/TypedescriptorTest.java index 11c13c4aa81f..25d07e371065 100644 --- a/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/TypedescriptorTest.java +++ b/tests/ballerina-compiler-api-test/src/test/java/io/ballerina/semantic/api/test/TypedescriptorTest.java @@ -1259,7 +1259,7 @@ private static void assertList(List actualValues, List expec LinePosition linePosition = lineRange.startLine(); return val.equals( new SymbolInfo(linePosition.line(), linePosition.offset(), - lineRange.filePath(), sym.kind(), sym.getName().get(), + lineRange.fileName(), sym.kind(), sym.getName().get(), ((BallerinaSymbol) sym).getInternalSymbol().owner.toString())); }), "Symbol not found: " + val); diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BAssertUtil.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BAssertUtil.java index 61fc25f119c1..a8eee413d23d 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BAssertUtil.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BAssertUtil.java @@ -63,7 +63,7 @@ public static void validateError(CompileResult result, int errorIndex, String ex "incorrect line number:"); Assert.assertEquals(diag.location().lineRange().startLine().offset() + 1, expectedErrCol, "incorrect column position:"); - Assert.assertEquals(diag.location().lineRange().filePath(), + Assert.assertEquals(diag.location().lineRange().fileName(), fileName, "incorrect file name:"); } diff --git a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BRunUtil.java b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BRunUtil.java index f918351284a4..5721923425c4 100644 --- a/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BRunUtil.java +++ b/tests/ballerina-test-utils/src/main/java/org/ballerinalang/test/BRunUtil.java @@ -169,7 +169,7 @@ private static Object invoke(CompileResult compileResult, BIRNode.BIRFunction fu String funcClassName = JarResolver.getQualifiedClassName(packageManifest.org().toString(), packageManifest.name().toString(), packageManifest.version().toString(), - getClassName(function.pos.lineRange().filePath())); + getClassName(function.pos.lineRange().fileName())); try { Class funcClass = compileResult.getClassLoader().loadClass(funcClassName);