Merge 'upstream/master' into issue_43029

ballerina-platform · Sep 5, 2024 · fa0cf9b · fa0cf9b
2 parents 5f118b8 + 9a6321e
commit fa0cf9b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/...ll/modules/shell-core/src/main/java/io/ballerina/shell/parser/trials/ExpressionTrial.java b/...ll/modules/shell-core/src/main/java/io/ballerina/shell/parser/trials/ExpressionTrial.java
@@ -22,6 +22,7 @@
 import io.ballerina.compiler.syntax.tree.ExpressionNode;
 import io.ballerina.compiler.syntax.tree.Node;
 import io.ballerina.compiler.syntax.tree.NodeParser;
+import io.ballerina.shell.parser.ParserConstants;
 import io.ballerina.shell.parser.TrialTreeParser;
 
 import java.util.ArrayList;
@@ -57,7 +58,16 @@ public Collection<Node> parse(String source) throws ParserTrialFailedException {
         if (expressionNode.hasDiagnostics()) {
             throw new ParserTrialFailedException("Error occurred during extracting expression from the statement");
         }
+        validateExpression(expressionNode.toSourceCode());
         nodes.add(expressionNode);
         return nodes;
     }
+
+    private void validateExpression(String expression) {
+        String functionName = expression.replaceAll("\\s*\\(.*", "");
+        if (ParserConstants.isFunctionNameRestricted(functionName)) {
+            String message = String.format("Function name '%s' not allowed in Ballerina Shell.%n", functionName);
+            throw new InvalidMethodException(message);
+        }
+    }
 }
diff --git a/build.gradle b/build.gradle
@@ -12,6 +12,10 @@ plugins {
 apply from: "$rootDir/gradle/repositories.gradle"
 
 allprojects {
+    tasks.withType(JavaCompile).configureEach {
+        options.fork = true
+    }
+
     group = project.group
     version = project.version
 
@@ -144,4 +148,3 @@ sonarqube {
 }
 
 copyBallerinaClassFiles.dependsOn copyExecFilesAndJavaClassFiles 
-createCodeCoverageReport.dependsOn copyBallerinaClassFiles
diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/ConfigReader.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/ConfigReader.java
@@ -137,7 +137,7 @@ private static boolean isDirectDependency(Collection<ModuleDependency> moduleDep
                         dependency.descriptor().packageName().value().equals(packageName) &&
                         (moduleName == null
                                 ? dependency.descriptor().name().moduleNamePart() == null
-                                : dependency.descriptor().name().moduleNamePart().equals(moduleName))
+                                : moduleName.equals(dependency.descriptor().name().moduleNamePart()))
         );
     }
 

diff --git a/...rina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ObservabilityDesugar.java b/...rina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ObservabilityDesugar.java
@@ -67,7 +67,7 @@ void addObserveInternalModuleImport(BLangPackage pkgNode) {
             importDcl.alias = ASTBuilderUtil.createIdentifier(pkgNode.pos, "_");
             importDcl.version = ASTBuilderUtil.createIdentifier(pkgNode.pos, "");
             importDcl.symbol = packageCache.getSymbol(PackageID.OBSERVE_INTERNAL);
-            pkgNode.imports.add(importDcl);
+            pkgNode.imports.add(0, importDcl);
             pkgNode.symbol.imports.add(importDcl.symbol);
         }
     }

diff --git a/distribution/zip/jballerina-tools/resources/profiler/profiler_output.html b/distribution/zip/jballerina-tools/resources/profiler/profiler_output.html
@@ -108,7 +108,7 @@
               }.balLogo {
                  padding-left: 50px !important;
                  padding-top: 25px !important;
-                 object-fit: contain; !important;
+                 object-fit: contain !important;
                  width: 500px !important;
                  height: auto !important;
               }

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.vfs.watch=false
 systemProp.scan.capture-build-logging=false
 systemProp.scan.capture-test-logging=false
 
-version=2201.10.0-SNAPSHOT
+version=2201.11.0-SNAPSHOT
 group=org.ballerinalang
 bootstrappedOn=1.1.0-alpha
 specVersion=2024R1

diff --git a/...nsions/modules/bal-shell-service/src/test/resources/testcases/getResult/errors.parse.json b/...nsions/modules/bal-shell-service/src/test/resources/testcases/getResult/errors.parse.json
@@ -43,5 +43,14 @@
       "metaInfo":{"definedVars":[],"moduleDclns":[]},
       "consoleOut":""
     }
+  },
+  {
+    "source": "main()",
+    "result": {
+      "errors":["Parsing the node from the statement failed."],
+      "diagnostics":["Function name \u0027main\u0027 not allowed in Ballerina Shell.\n"],
+      "metaInfo":{"definedVars":[],"moduleDclns":[]},
+      "consoleOut":""
+    }
   }
 ]