[feature] Go support by zortenburger · Pull Request #507 · JetBrains/bazel-bsp

zortenburger · 2024-01-09T23:38:23Z

BAZEL-749

abrams27 · 2024-01-12T14:13:06Z

MODULE.bazel

 bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "platforms", version = "0.0.8")
 bazel_dep(name = "rules_python", version = "0.27.1")
+bazel_dep(name = "rules_go", version = "0.43.0")


i think you dont need it

# Conflicts: # MODULE.bazel

# Conflicts: # protocol/src/main/kotlin/org/jetbrains/bsp/utils/Extractors.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/bsp/managers/BazelBspLanguageExtensionsGenerator.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/common/ServerContainer.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/LanguagePluginsService.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/model/Language.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/proto/bsp_target_info.proto # server/src/test/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/LanguagePluginServiceTest.kt

abrams27

some small things, so far looks good

abrams27 · 2024-03-14T14:06:32Z

aspects/rules/go/go_info.bzl

+load("//aspects:utils/utils.bzl", "create_proto", "create_struct", "file_location")
+load("@io_bazel_rules_go//go:def.bzl", "go_context")
+
+def extract_sdk(ctx):


let's put an _ to mark that's "private" and put the definition below its usage - so just put it under the extract_go_info

abrams27 · 2024-03-14T14:09:15Z

aspects/rules/go/go_info.bzl

+        return None
+    return file_location(go.sdk.go)
+
+def extract_go_info(target, ctx, **kwargs):


you also need to check is it a go target (we usually check is there a language provider in the target, if not then we return None, None)

abrams27 · 2024-03-14T14:10:30Z

aspects/rules/go/go_info.bzl

+    return file_location(go.sdk.go)
+
+def extract_go_info(target, ctx, **kwargs):
+    importpath = getattr(ctx.rule.attr, "importpath", [])


importpath is a string, so the default fallback should be an empty string (or none)

abrams27 · 2024-03-14T14:11:10Z

protocol/src/main/kotlin/org/jetbrains/bsp/GoBuildTarget.kt

+
+data class GoBuildTarget(
+  val sdkHomePath: URI?,
+  val importPath: String?,


question is: can target have no import path?

abrams27 · 2024-03-14T14:15:24Z

server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/go/GoModule.kt

+data class GoModule (
+  val sdkHomePath: URI?,
+  val importPath: String?,
+): LanguageData


abrams27 · 2024-03-14T14:15:27Z

server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/go/GoLanguagePlugin.kt

+        val goSdkDir = goBinaryPath.parent.parent
+        goSdkDir.toUri()
+      }
+}


abrams27 · 2024-03-14T14:19:49Z

plus you can also rebase it and try to add e2e tests

# Conflicts: # MODULE.bazel.lock # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/bsp/managers/BazelBspLanguageExtensionsGenerator.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/TargetInfoReader.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/model/Language.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/proto/bsp_target_info.proto

abrams27

small thing

server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt

…k/go-support # Conflicts: # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/BazelBspServer.kt # server/src/test/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/LanguagePluginServiceTest.kt

# Conflicts: # MODULE.bazel.lock # server/src/test/kotlin/org/jetbrains/bsp/bazel/server/bsp/managers/BazelBspLanguageExtensionsGeneratorTest.kt

# Conflicts: # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BspProjectMapper.kt

…support # Conflicts: # .bazelrc # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt

# Conflicts: # .bazelrc # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/TargetInfoReader.kt

# Conflicts: # .bazelrc # aspects/rules/go/go_info.bzl.template # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt

abrams27

looks reallny nice, some minor comments

abrams27 · 2024-05-23T16:26:15Z

server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/model/Library.kt

+        val goImportPath: String? = "",
+        val goRoot: URI? = URI(""),


can be null since it's nullable

makes sense

abrams27 · 2024-05-23T16:27:16Z

protocol/src/main/kotlin/org/jetbrains/bsp/WorkspaceLibraries.kt

+  val goImportPath: String? = "",
+  val goRoot: URI? = URI(""),


can be null as ewll

abrams27 · 2024-05-23T16:49:44Z

aspects/rules/go/go_info.bzl.template

+    importpath = go_archive.data.importpath
+    sdk_home_path = _extract_sdk(ctx)
+
+    go_target_info = create_struct(


pls dont forget about embeds

edokimok and others added 6 commits January 10, 2024 00:06

Obtain some info from target

eb905a5

[feature] create go build target | #BAZEL-784 Done

d2ccd3f

[feature] obtain sdk info from targets in aspects | #BAZEL-785

36aab51

mock go sdk path

1e79bd5

[feature] create go language plugin | #BAZEL-787

4e218de

fix go extension test

f8a75e1

abrams27 reviewed Jan 12, 2024

View reviewed changes

maclick added 7 commits January 20, 2024 01:42

Merge branch 'master' into go-support

bc4b68f

# Conflicts: # MODULE.bazel

remove rules_go dependency

919bf1c

set sdk home path properly

72b9e32

store sdk home path as go base dir

0a60ae4

adapt to new code

cbd25f1

ooops, commited too fast

7eec540

abrams27 reviewed Mar 14, 2024

View reviewed changes

maclick added 3 commits March 28, 2024 17:40

add go as a workspace target

68ce191

requested changes

43614e3

abrams27 reviewed Apr 9, 2024

View reviewed changes

server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt Show resolved Hide resolved

maclick and others added 10 commits April 12, 2024 01:23

Merge remote-tracking branch 'refs/remotes/jetbrains/master' into for…

0b37581

…k/go-support # Conflicts: # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/BazelBspServer.kt # server/src/test/kotlin/org/jetbrains/bsp/bazel/server/sync/languages/LanguagePluginServiceTest.kt

go tests should also be included as workspace targets

ffe2ba2

GO E2E test (#1)

f48904c

Add goImportPath to Library

259e562

WIP, working importpath, empty root

25e772e

Add default value in LibraryItem

519b15a

Merge branch 'refs/heads/master' into fork/go-support

2f7b4ae

# Conflicts: # MODULE.bazel.lock # server/src/test/kotlin/org/jetbrains/bsp/bazel/server/bsp/managers/BazelBspLanguageExtensionsGeneratorTest.kt

fix buildifier for go e2e test project

8a58145

fix buildifier for go e2e test project (again)

5faf42f

fix tests

b9f50bc

edokimok and others added 15 commits April 24, 2024 15:38

Add goImportPath to Library

50f03f4

WIP, working importpath, empty root

384242e

Add default value in LibraryItem

d68e840

inherit build target root directory from its sources

b1d9db4

Merge remote-tracking branch 'origin/libraries' into libraries

b647526

# Conflicts: # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BspProjectMapper.kt

Green code!

45cc62b

Fix indentation

539afb8

Minor fixes

6d72bc7

Fix more indentation

4030fdf

External dependencies (#2)

e509bba

Change go rules to template (#3)

52029e4

Merge remote-tracking branch 'refs/remotes/jetbrains/master' into go-…

c983d1e

…support # Conflicts: # .bazelrc # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt

Merge remote-tracking branch 'refs/remotes/upstream/master' into backup

2b9f450

# Conflicts: # .bazelrc # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/TargetInfoReader.kt

Rebase go aspects

58713f8

Merge remote-tracking branch 'zortenburger/go-support' into backup

ef65da8

# Conflicts: # .bazelrc # aspects/rules/go/go_info.bzl.template # server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/BazelProjectMapper.kt

edokimok force-pushed the go-support branch from 3f51766 to ef65da8 Compare May 23, 2024 16:12

abrams27 reviewed May 23, 2024

View reviewed changes

Conversation

zortenburger commented Jan 9, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abrams27 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abrams27 commented Mar 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abrams27 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

abrams27 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

abrams27 commented Mar 14, 2024 •

edited

Loading