chore(copybara): sync commits from Aspect-internal silo

cmd/aspect/main.go

@@ -45,7 +45,7 @@ func main() {
 	streams := ioutils.DefaultStreams
 
 	// Re-enter another aspect if version running is not the configured version
-	reentered, exitCode, err := bzl.MaybeReenterAspect(streams, os.Args[1:])
+	reentered, exitCode, err := bzl.MaybeReenterAspect(streams, os.Args[1:], root.CheckAspectLockVersionFlag(os.Args[1:]))
 	if reentered {
 		if err != nil {
 			aspecterrors.HandleError(err)

cmd/aspect/root/root.go

@@ -67,6 +67,15 @@ func NewDefaultCmd(pluginSystem system.PluginSystem) *cobra.Command {
 	return NewCmd(ioutils.DefaultStreams, pluginSystem, defaultInteractive)
 }
 
+func CheckAspectLockVersionFlag(args []string) bool {
+	for _, arg := range args {
+		if arg == "--"+flags.AspectLockVersion {
+			return true
+		}
+	}
+	return false
+}
+
 func MaybeAspectVersionFlag(streams ioutils.Streams, args []string) {
 	if len(args) == 1 && (args[0] == "--version" || args[0] == "-v") {
 		fmt.Fprintf(streams.Stdout, "%s %s\n", buildinfo.Current().GnuName(), buildinfo.Current().Version())

gazelle/kotlin/kotlin.go

@@ -3,5 +3,5 @@ package gazelle
 import "strings"
 
 func IsNativeImport(impt string) bool {
-	return strings.HasPrefix(impt, "kotlin.") || strings.HasPrefix(impt, "java.") || strings.HasPrefix(impt, "javax.")
+	return strings.HasPrefix(impt, "kotlin.") || strings.HasPrefix(impt, "kotlinx.") || strings.HasPrefix(impt, "java.") || strings.HasPrefix(impt, "javax.")
 }

gazelle/kotlin/parser/parser.go

@@ -63,7 +63,7 @@ func (p *treeSitterParser) ParsePackage(filePath, source string) (string, []erro
 					os.Exit(1)
 				}
 
-				pkg = readIdentifier(getLoneChild(nodeI, "identifier"), sourceCode)
+				pkg = readIdentifier(getLoneChild(nodeI, "identifier"), sourceCode, false)
 			}
 		}
 
@@ -104,10 +104,18 @@ func (p *treeSitterParser) ParseImports(filePath, source string) ([]string, []er
 				for j := 0; j < int(nodeI.NamedChildCount()); j++ {
 					nodeJ := nodeI.NamedChild(j)
 					if nodeJ.Type() == "import_header" {
-						for k := 0; k < int(nodeJ.NamedChildCount()); k++ {
-							nodeK := nodeJ.NamedChild(k)
+						for k := 0; k < int(nodeJ.ChildCount()); k++ {
+							nodeK := nodeJ.Child(k)
 							if nodeK.Type() == "identifier" {
-								imports.Add(readIdentifier(nodeK, sourceCode))
+								isStar := false
+								for l := k + 1; l < int(nodeJ.ChildCount()); l++ {
+									if nodeJ.Child(l).Type() == ".*" {
+										isStar = true
+										break
+									}
+								}
+
+								imports.Add(readIdentifier(nodeK, sourceCode, !isStar))
 							}
 						}
 					}
@@ -140,15 +148,20 @@ func getLoneChild(node *sitter.Node, name string) *sitter.Node {
 	return nil
 }
 
-func readIdentifier(node *sitter.Node, sourceCode []byte) string {
+func readIdentifier(node *sitter.Node, sourceCode []byte, ignoreLast bool) string {
 	if node.Type() != "identifier" {
 		fmt.Printf("Must be type 'identifier': %v - %s", node.Type(), node.Content(sourceCode))
 		os.Exit(1)
 	}
 
 	var s strings.Builder
 
-	for c := 0; c < int(node.NamedChildCount()); c++ {
+	total := int(node.NamedChildCount())
+	if ignoreLast {
+		total = total - 1
+	}
+
+	for c := 0; c < total; c++ {
 		nodeC := node.NamedChild(c)
 
 		// TODO: are there any other node types under an "identifier"

gazelle/kotlin/parser/parser_test.go

@@ -19,34 +19,39 @@ var testCases = []struct {
 		imports:  []string{},
 	},
 	{
-		desc:     "simple",
-		kt:       "import a.b",
+		desc: "simple",
+		kt: `
+import a.B
+import c.D as E
+	`,
 		filename: "simple.kt",
 		pkg:      "",
-		imports:  []string{"a.b"},
+		imports:  []string{"a", "c"},
+	},
+	{
+		desc: "stars",
+		kt: `package a.b.c
+
+import  d.y.* 
+		`,
+		filename: "stars.kt",
+		pkg:      "a.b.c",
+		imports:  []string{"d.y"},
 	},
 	{
 		desc: "comments",
 		kt: `
-/*dlfkj*/			package /*dlfkj*/ x // x
+/*dlfkj*/package /*dlfkj*/ x // x
 //z
-import a.b // y
+import a.B // y
 //z
 
-/* asdf */ import /* asdf */ c./* asdf */d // w
-		`,
-		filename: "empty.kt",
+/* asdf */ import /* asdf */ c./* asdf */D // w
+import /* fdsa */ d/* asdf */.* // w
+				`,
+		filename: "comments.kt",
 		pkg:      "x",
-		imports:  []string{"a.b", "c.d"},
-	},
-	{
-		desc: "stars",
-		kt: `package a.b.c
-
-		import d.y.*`,
-		filename: "stars.kt",
-		pkg:      "a.b.c",
-		imports:  []string{"d.y"},
+		imports:  []string{"a", "c", "d"},
 	},
 }
 
@@ -57,7 +62,13 @@ func TestTreesitterParser(t *testing.T) {
 			actualImports, _ := NewParser().ParseImports(tc.filename, tc.kt)
 
 			if !equal(actualImports, tc.imports) {
-				t.Errorf("Inequality.\nactual:  %#v;\nimports: %#v\nkotlin code:\n%v", actualImports, tc.imports, tc.kt)
+				t.Errorf("Imports...\nactual:  %#v;\nexpected: %#v\nkotlin code:\n%v", actualImports, tc.imports, tc.kt)
+			}
+
+			actualPackage, _ := NewParser().ParsePackage(tc.filename, tc.kt)
+
+			if actualPackage != tc.pkg {
+				t.Errorf("Package....\nactual:  %#v;\nexpected: %#v\nkotlin code:\n%v", actualPackage, tc.pkg, tc.kt)
 			}
 		})
 	}

gazelle/kotlin/resolver.go

@@ -26,11 +26,11 @@ type Resolver struct {
 }
 
 const (
-	Resolution_Error      = -1
-	Resolution_None       = 0
-	Resolution_NotFound   = 1
-	Resolution_Label      = 2
-	Resolution_NativeNode = 3
+	Resolution_Error        = -1
+	Resolution_None         = 0
+	Resolution_NotFound     = 1
+	Resolution_Label        = 2
+	Resolution_NativeKotlin = 3
 )
 
 type ResolutionType = int
@@ -83,7 +83,7 @@ func (kt *Resolver) Resolve(c *config.Config, ix *resolve.RuleIndex, rc *repo.Re
 	start := time.Now()
 	BazelLog.Infof("Resolve '%s' dependencies", from.String())
 
-	if r.Kind() != KtJvmLibrary {
+	if r.Kind() == KtJvmLibrary {
 		deps, err := kt.resolveImports(c, ix, importData.(*KotlinImports).imports, from)
 		if err != nil {
 			log.Fatal("Resolution Error: ", err)
@@ -115,12 +115,21 @@ func (kt *Resolver) resolveImports(
 			return nil, err
 		}
 
-		if resolutionType == Resolution_NativeNode || resolutionType == Resolution_None {
+		if resolutionType == Resolution_NotFound {
+			BazelLog.Debugf("import '%s' for target '%s' not found", mod.Imp, from.String())
+
+			notFound := fmt.Errorf(
+				"Import %[1]q from %[2]q is an unknown dependency. Possible solutions:\n"+
+					"\t1. Instruct Gazelle to resolve to a known dependency using a directive:\n"+
+					"\t\t# gazelle:resolve [src-lang] kotlin import-string label\n",
+				mod.Imp, mod.SourcePath,
+			)
+
+			fmt.Printf("Resolution error %v\n", notFound)
 			continue
 		}
 
-		if resolutionType == Resolution_NotFound {
-			// TODO: collect errors
+		if resolutionType == Resolution_NativeKotlin || resolutionType == Resolution_None {
 			continue
 		}
 
@@ -176,7 +185,7 @@ func (kt *Resolver) resolveImport(
 
 	// Native kotlin imports
 	if IsNativeImport(impt.Imp) {
-		return Resolution_NativeNode, nil, nil
+		return Resolution_NativeKotlin, nil, nil
 	}
 
 	// TODO: maven imports

gazelle/kotlin/tests/local_deps/BUILD.out

@@ -3,4 +3,8 @@ load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 kt_jvm_library(
     name = "local_deps",
     srcs = ["main.kt"],
+    deps = [
+        "//impt",
+        "//impt-star",
+    ],
 )

gazelle/kotlin/tests/local_deps/impt-star/BUILD.out

@@ -0,0 +1,7 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+
+kt_jvm_library(
+    name = "impt-star",
+    srcs = ["S.kt"],
+    deps = ["//sub1"],
+)

gazelle/kotlin/tests/local_deps/impt-star/S.kt

@@ -0,0 +1,7 @@
+package test.imptstar
+
+import test.a.*
+
+class Rectangle2(var height: Double, var length: Double): Shape() {
+    var perimeter = (height + length) * 2
+}

gazelle/kotlin/tests/local_deps/impt/B.kt

@@ -0,0 +1,7 @@
+package test.impt
+
+import test.a.Shape
+
+class Rectangle(var height: Double, var length: Double): Shape() {
+    var perimeter = (height + length) * 2
+}

gazelle/kotlin/tests/local_deps/sub2/BUILD.out → gazelle/kotlin/tests/local_deps/impt/BUILD.out

@@ -1,6 +1,7 @@
 load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 
 kt_jvm_library(
-    name = "sub2",
+    name = "impt",
     srcs = ["B.kt"],
+    deps = ["//sub1"],
 )

gazelle/kotlin/tests/local_deps/main.kt

@@ -1,10 +1,10 @@
 package test.root
 
 // Basic
-import test.A
-import test.B
+import test.impt.Rectangle
+import test.imptstar.*
 
 fun main() {
    A.f()
-   B.f()
+   Rectangle.f()
 }

gazelle/kotlin/tests/local_deps/sub1/A.kt

@@ -1 +1,3 @@
-package test.a
+package test.a
+
+open class Shape

gazelle/kotlin/tests/unknown_imports/BUILD.out

@@ -0,0 +1,6 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+
+kt_jvm_library(
+    name = "simple_file",
+    srcs = ["main.kt"],
+)

gazelle/kotlin/tests/unknown_imports/WORKSPACE

@@ -0,0 +1,2 @@
+# This is a Bazel workspace for the Gazelle test data.
+workspace(name = "simple_file")

gazelle/kotlin/tests/unknown_imports/expectedStdout.txt

@@ -0,0 +1,4 @@
+Resolution error Import "foo" from "main.kt" is an unknown dependency. Possible solutions:
+	1. Instruct Gazelle to resolve to a known dependency using a directive:
+		# gazelle:resolve [src-lang] kotlin import-string label
+

gazelle/kotlin/tests/unknown_imports/main.kt

@@ -0,0 +1,5 @@
+import foo.bar
+
+fun main() {
+    println("Hello world!")
+}

integration_tests/aspect/flags_test.bats

@@ -33,6 +33,37 @@ EOF
     assert_output --partial "INFO: Build completed successfully"
 }
 
+@test 'lock_version flag should prevent downloading and running bazeliskrc version' {
+    cat > .bazeliskrc << 'EOF'
+BAZELISK_BASE_URL=https://static.aspect.build/aspect
+USE_BAZEL_VERSION=aspect/1.2.3
+EOF
+    run aspect --version
+    assert_failure
+    assert_output --partial "could not download Bazel"
+
+    run aspect --version --aspect:lock_version
+    assert_success
+    assert_output --partial "Locking Aspect CLI version to"
+
+    rm .bazeliskrc
+}
+
+@test 'lock_version flag should prevent downloading and running config version' {
+    cat > version-config.yaml << 'EOF'
+version: 1.2.3
+EOF
+    run aspect --aspect:config="version-config.yaml" --version
+    assert_failure
+    assert_output --partial "could not download Bazel"
+
+    run aspect --aspect:config="version-config.yaml" --version --aspect:lock_version
+    assert_success
+    assert_output --partial "Locking Aspect CLI version to"
+
+    rm version-config.yaml
+}
+
 @test '--[no]able flags should work' {
     cat > BUILD.bazel << 'EOF'
 genrule(
@@ -46,7 +77,7 @@ EOF
 }
 
 
-@test 'uknown flags should fail' {
+@test 'unknown flags should fail' {
     run aspect build :foo --noannounce_rcc
     assert_output --partial "ERROR: --noannounce_rcc :: Unrecognized option: --noannounce_rcc"
 }

pkg/aspect/root/flags/aspect_flags.go

@@ -18,6 +18,7 @@ package flags
 
 const (
 	AspectFlagPrefix              = "aspect:"
+	AspectLockVersion             = AspectFlagPrefix + "lock_version"
 	AspectConfigFlagName          = AspectFlagPrefix + "config"
 	AspectSystemConfigFlagName    = AspectFlagPrefix + "system_config"
 	AspectWorkspaceConfigFlagName = AspectFlagPrefix + "workspace_config"

pkg/aspect/root/flags/interceptor.go

@@ -28,8 +28,11 @@ import (
 	"aspect.build/cli/pkg/ioutils"
 )
 
-// AddGlobalFlags will add aspect specfic flags to all cobra commands.
+// AddGlobalFlags will add Aspect specific flags to all cobra commands.
 func AddGlobalFlags(cmd *cobra.Command, defaultInteractive bool) {
+	cmd.PersistentFlags().Bool(AspectLockVersion, false, "Lock the version of the Aspect CLI. This prevents the Aspect CLI from downloading and running an different version of the Aspect CLI if one is specified in .bazeliskrc or the Aspect CLI config.")
+	cmd.PersistentFlags().MarkHidden(AspectLockVersion)
+
 	cmd.PersistentFlags().String(AspectConfigFlagName, "", fmt.Sprintf("User-specified Aspect CLI config file. /dev/null indicates that all further --%s flags will be ignored.", AspectConfigFlagName))
 
 	RegisterNoableBool(cmd.PersistentFlags(), AspectSystemConfigFlagName, true, "Whether or not to look for the system config file at /etc/aspect/cli/config.yaml")