[feat] GO support #43

maclick · 2024-01-24T00:25:47Z

[feature] create go build target |#BAZEL-784 Done
calculateAllGoSdkInfos done
added setSdk
go sdk mock works
changed home path to /usr/local/go
added isGoSupportEnabled = true for each module
extension point for Go SDK - not yet full working

# Conflicts: # buildSrc/src/main/kotlin/versions.kt # protocol/src/main/kotlin/org/jetbrains/bsp/utils/Extractors.kt # src/main/kotlin/org/jetbrains/plugins/bsp/config/BspFeatureFlags.kt # src/main/kotlin/org/jetbrains/plugins/bsp/server/tasks/CollectProjectDetailsTask.kt # src/main/resources/META-INF/plugin.xml # src/main/resources/messages/BspPluginBundle.properties

# Conflicts: # buildSrc/src/main/kotlin/versions.kt # protocol/src/main/kotlin/org/jetbrains/bsp/protocol/utils/Extractors.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/TargetIdToModuleEntitiesMap.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/GoWorkspaceModelEntities.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/impl/WorkspaceModelUpdaterImpl.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/impl/updaters/GoModuleUpdater.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/impl/updaters/transformers/ModuleDetailsToGoModuleTransformer.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/impl/updaters/transformers/ProjectDetailsToModuleDetailsTransformer.kt # src/main/kotlin/org/jetbrains/plugins/bsp/server/tasks/CollectProjectDetailsTask.kt # src/main/resources/messages/BspPluginBundle.properties

* added isGoSupportEnabled = true for each module * fixed imports and added toGoModule --------- Co-authored-by: Maciej Bielik <[email protected]>

# Conflicts: # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/DefaultMagicMetaModelState.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/JavaWorkspaceModelEntities.kt

# Conflicts: # src/main/kotlin/org/jetbrains/plugins/bsp/server/tasks/CollectProjectDetailsTask.kt

abrams27

small thing

abrams27 · 2024-04-09T09:27:02Z

src/main/kotlin/org/jetbrains/plugins/bsp/extension/points/GoSdkGetterExtension.kt

+public fun goSdkExtensionExists(): Boolean = ep.extensionList.isNotEmpty()
+
+public class GoSdkGetter: GoSdkGetterExtension {
+  private var goSdks: Set<GoSdk> = emptySet()


extension points shouldnt have state, so i'd be better to keep it in a service with state

bump (you can check DefaultConnectionDetailsProviderExtension for an inspiration)

# Conflicts: # buildSrc/src/main/kotlin/versions.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/MagicMetaModelImpl.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/TargetIdToModuleEntitiesMap.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/WorkspaceModelToModulesMapTransformer.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/impl/WorkspaceModelUpdaterImpl.kt # src/main/kotlin/org/jetbrains/plugins/bsp/server/tasks/CollectProjectDetailsTask.kt # src/main/kotlin/org/jetbrains/plugins/bsp/ui/gutters/BspJVMRunLineMarkerContributor.kt # src/main/resources/META-INF/plugin.xml

abrams27

looks nice in general some comments / questions

abrams27 · 2024-05-23T14:24:03Z

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


 public data class LibraryItem(
  val id: BuildTargetIdentifier,
  val dependencies: List<BuildTargetIdentifier>,
  val ijars: List<String>,
  val jars: List<String>,
  val sourceJars: List<String>,
-)
+  val goImportPath: String? = "",


if it's nullable, why default is not null?

abrams27 · 2024-05-23T14:24:10Z

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


 public data class LibraryItem(
  val id: BuildTargetIdentifier,
  val dependencies: List<BuildTargetIdentifier>,
  val ijars: List<String>,
  val jars: List<String>,
  val sourceJars: List<String>,
-)
+  val goImportPath: String? = "",
+  val goRoot: URI? = URI(""),


abrams27 · 2024-05-23T14:25:19Z

src/main/kotlin/org/jetbrains/plugins/bsp/extension/points/GoSdkGetterExtension.kt

+public fun goSdkExtensionExists(): Boolean = ep.extensionList.isNotEmpty()
+
+public class GoSdkGetter: GoSdkGetterExtension {
+  private var goSdks: Set<GoSdk> = emptySet()


bump (you can check DefaultConnectionDetailsProviderExtension for an inspiration)

abrams27 · 2024-05-23T14:28:46Z

...otlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/WorkspaceModelEntities.kt

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


same here - it can be null

abrams27 · 2024-05-23T14:32:09Z

src/main/kotlin/org/jetbrains/plugins/bsp/ui/gutters/BspJVMRunLineMarkerContributor.kt

+    (!isInsideJar() && getStrictParentOfType<PsiNameIdentifierOwner>()
+      ?.isClassOrMethod() ?: false) || isGoTopLevelFunction()
+
+  private fun PsiElement.isGoTopLevelFunction() =


i believe that u need to create a separate class for go (to register it correctly in plugin.xml) but prob it'd be worth to create a base class and just 2 impls: jvm and go

abrams27 · 2024-05-23T14:34:12Z

...rg/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/impl/updaters/GoModuleUpdater.kt

+    if (!goEntitiesExtensionExists()) {
+      error("Go entities extension does not exist.")
+    }
+    val goEntitiesExtension = goEntitiesExtension()!!


it can be done: goEntitiesExtension ?: error("Go entities extension does not exist.")

abrams27 · 2024-05-23T14:45:43Z

...ains/plugins/bsp/magicmetamodel/impl/workspacemodel/WorkspaceModelToModulesMapTransformer.kt

@@ -95,6 +96,7 @@ public object WorkspaceModelToModulesMapTransformer {
        languageIds = entity.customImlData?.customModuleOptions.orEmpty(),
        associates = entity.getKotlinSettings()?.getAssociates().orEmpty(),
      )
+      // TODO: add support for GoModule


abrams27 · 2024-05-23T14:50:46Z

...tamodel/impl/workspacemodel/impl/updaters/transformers/ModuleDetailsToGoModuleTransformer.kt

+      .asSequence()
+      .mapNotNull { targetsMap[it] }
+      .map { it.id.toBsp4JTargetIdentifier() }
+      .mapNotNull { buildTargetIdentifier -> projectDetails.targets.find { it.id == buildTargetIdentifier } }


it'll be slow for big projects, maybe it's better to create an index before

Merge master

Add tests for Go resources

zortenburger and others added 7 commits December 14, 2023 04:12

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

927fe14

calculateAllGoSdkInfos done

dea7e27

added setSdk

22e2e8a

go sdk mock works

40d76e8

changed home path to /usr/local/go

a843252

added isGoSupportEnabled = true for each module

e53c401

extension point for Go SDK - not yet full working

5f47add

maclick changed the title ~~go support~~ [feat] GO support Jan 24, 2024

maclick marked this pull request as draft January 24, 2024 00:28

maclick and others added 16 commits January 24, 2024 01:32

Merge branch 'main' into go-support

e3f49be

clenup

f77ae5e

Work in progress, add internal dependencies

2de6adc

cos

f8bd25b

merge cleanup

368bb0c

small style changes

9f5e27b

Fix indentation, cleanup (#4)

369b5f7

GoModule toState (#3)

f275b76

* added isGoSupportEnabled = true for each module * fixed imports and added toGoModule --------- Co-authored-by: Maciej Bielik <[email protected]>

Merge remote-tracking branch 'upstream/main' into go-support

d43fa4e

# Conflicts: # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/DefaultMagicMetaModelState.kt # src/main/kotlin/org/jetbrains/plugins/bsp/magicmetamodel/impl/workspacemodel/JavaWorkspaceModelEntities.kt

cleanup after main merge

cf5f1a1

fix detekt

ca18964

Go support sources (#5)

b37a80d

move go plugin usages to extension point (#6)

b356780

Fix go related data in MMM state (#7)

b082f1d

maclick force-pushed the go-support branch from 42c6d1a to b082f1d Compare April 3, 2024 11:14

Merge branch 'upstream-main' into go-support

47089ed

# Conflicts: # src/main/kotlin/org/jetbrains/plugins/bsp/server/tasks/CollectProjectDetailsTask.kt

abrams27 reviewed Apr 9, 2024

View reviewed changes

edokimok and others added 2 commits April 18, 2024 13:42

WIP, working importpath, empty root

ea83181

pass target root for Go build targets

1bd89ea

edokimok added 4 commits April 25, 2024 11:47

Green code!

4876112

Minor fix

de6e867

Add shouldAddMarker for Go top level functions

d9efbeb

Set should replace to true

58e66a3

edokimok force-pushed the go-support branch from 32a734b to 58e66a3 Compare May 23, 2024 08:07

edokimok added 2 commits May 23, 2024 11:03

Try merge

a9f3869

abrams27 reviewed May 23, 2024

View reviewed changes

maclick and others added 3 commits June 4, 2024 10:30

Merge pull request #10 from edokimok/backup

25c9a70

Merge master

Add tests for Go resources

d0eb941

Merge pull request #11 from zortenburger/go-support-resources-tests

9fa7c74

Add tests for Go resources

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[feat] GO support #43

[feat] GO support #43

maclick commented Jan 24, 2024

abrams27 left a comment

abrams27 Apr 9, 2024

abrams27 May 23, 2024

abrams27 left a comment

abrams27 May 23, 2024

abrams27 May 23, 2024

abrams27 May 23, 2024

abrams27 May 23, 2024

abrams27 May 23, 2024

abrams27 May 23, 2024

abrams27 May 23, 2024

abrams27 May 23, 2024

[feat] GO support #43

Are you sure you want to change the base?

[feat] GO support #43

Conversation

maclick commented Jan 24, 2024

abrams27 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abrams27 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment