Merge remote-tracking branch 'origin/develop' into wip/jtulach/StartupWithImport

Author: JaroslavTulach

app/gui2/e2e/collapsingAndEntering.spec.ts

@@ -4,6 +4,7 @@ import { expect } from './customExpect'
 import { mockCollapsedFunctionInfo } from './expressionUpdates'
 import { CONTROL_KEY } from './keyboard'
 import * as locate from './locate'
+import { mockSuggestion } from './suggestionUpdates'
 
 const MAIN_FILE_NODES = 12
 
@@ -81,9 +82,24 @@ test('Collapsing nodes', async ({ page }) => {
 
   await page.getByLabel('Group Selected Components').click()
   await expect(locate.graphNode(page)).toHaveCount(initialNodesCount - 2)
-  const collapsedNode = locate.graphNodeByBinding(page, 'prod')
-  await expect(collapsedNode.locator('.WidgetToken')).toHaveText(['Main', '.', 'collapsed', 'five'])
   await mockCollapsedFunctionInfo(page, 'prod', 'collapsed')
+  await mockSuggestion(page, {
+    type: 'method',
+    module: 'local.Mock_Project',
+    name: 'collapsed',
+    isStatic: true,
+    aliases: [],
+    arguments: [{ name: 'five', reprType: 'Any', isSuspended: false, hasDefault: false }],
+    selfType: 'local.Mock_Project',
+    returnType: 'Standard.Base.Any.Any',
+    documentation: [],
+    annotations: [],
+  })
+  const collapsedNode = locate.graphNodeByBinding(page, 'prod')
+  await expect(collapsedNode.locator('.WidgetFunctionName')).toExist()
+  await expect(collapsedNode.locator('.WidgetFunctionName .WidgetToken')).toHaveText(['Main', '.'])
+  await expect(collapsedNode.locator('.WidgetFunctionName input')).toHaveValue('collapsed')
+  await expect(collapsedNode.locator('.WidgetTopLevelArgument')).toHaveText('five')
 
   await locate.graphNodeIcon(collapsedNode).dblclick()
   await actions.ensureNoCircularMenusVisibleDueToHovering(page)

app/gui2/e2e/suggestionUpdates.ts

@@ -0,0 +1,7 @@
+import type { Page } from '@playwright/test'
+import * as lsTypes from 'ydoc-shared/languageServerTypes/suggestions'
+
+/** Add an entry to the suggestion database. */
+export async function mockSuggestion(page: Page, update: lsTypes.SuggestionEntry) {
+  await page.evaluate(({ update }) => (window as any)._mockSuggestion(update), { update })
+}

app/gui2/src/components/GraphEditor.vue

@@ -47,6 +47,7 @@ import type { RequiredImport } from '@/stores/graph/imports'
 import { useProjectStore } from '@/stores/project'
 import { provideSuggestionDbStore } from '@/stores/suggestionDatabase'
 import { suggestionDocumentationUrl, type Typename } from '@/stores/suggestionDatabase/entry'
+import { applyUpdates } from '@/stores/suggestionDatabase/lsUpdate'
 import { provideVisualizationStore } from '@/stores/visualization'
 import { bail } from '@/util/assert'
 import type { AstId } from '@/util/ast/abstract'
@@ -71,6 +72,7 @@ import {
   type ComponentInstance,
 } from 'vue'
 import { encodeMethodPointer } from 'ydoc-shared/languageServerTypes'
+import * as lsTypes from 'ydoc-shared/languageServerTypes/suggestions'
 import * as iterable from 'ydoc-shared/util/data/iterable'
 import { isDevMode } from 'ydoc-shared/util/detect'
 
@@ -84,6 +86,7 @@ const widgetRegistry = provideWidgetRegistry(graphStore.db)
 const _visualizationStore = provideVisualizationStore(projectStore)
 const visible = injectVisibility()
 provideFullscreenContext(rootNode)
+;(window as any)._mockSuggestion = suggestionDb.mockSuggestion
 
 onMounted(() => {
   widgetRegistry.loadWidgets(Object.entries(builtinWidgets))

app/gui2/src/components/GraphEditor/widgets/WidgetApplication.vue

@@ -25,8 +25,10 @@ const targetMaybePort = computed(() => {
     if (!ptr) return input
     const definition = graph.getMethodAst(ptr)
     if (!definition.ok) return input
-    input[FunctionName] = {
-      editableName: definition.value.name.externalId,
+    if (input.value instanceof Ast.PropertyAccess || input.value instanceof Ast.Ident) {
+      input[FunctionName] = {
+        editableName: definition.value.name.externalId,
+      }
     }
     return input
   } else {

app/gui2/src/components/GraphEditor/widgets/WidgetFunction.vue

@@ -67,8 +67,10 @@ const innerInput = computed(() => {
   const callInfo = methodCallInfo.value
   if (callInfo) {
     input[CallInfo] = callInfo
-    const definition = graph.getMethodAst(callInfo.methodCall.methodPointer)
-    if (definition.ok) input[FunctionName] = { editableName: definition.value.name.externalId }
+    if (input.value instanceof Ast.PropertyAccess || input.value instanceof Ast.Ident) {
+      const definition = graph.getMethodAst(callInfo.methodCall.methodPointer)
+      if (definition.ok) input[FunctionName] = { editableName: definition.value.name.externalId }
+    }
   }
   return input
 })

app/gui2/src/components/GraphEditor/widgets/WidgetFunctionName.vue

@@ -52,7 +52,7 @@ export const FunctionName: unique symbol = Symbol.for('WidgetInput:FunctionName'
 declare module '@/providers/widgetRegistry' {
   export interface WidgetInput {
     [FunctionName]?: {
-      /** Id of expression which is accepted by Lanugage Server's
+      /** Id of expression which is accepted by Language Server's
        * [`refactoring/renameSymbol` method](https://github.com/enso-org/enso/blob/develop/docs/language-server/protocol-language-server.md#refactoringrenamesymbol)
        */
       editableName: ExpressionId
@@ -63,7 +63,7 @@ declare module '@/providers/widgetRegistry' {
 function isFunctionName(
   input: WidgetInput,
 ): input is WidgetInput & { value: Ast.Ast; [FunctionName]: { editableName: ExpressionId } } {
-  return WidgetInput.isToken(input) && FunctionName in input
+  return WidgetInput.isAst(input) && FunctionName in input
 }
 
 export const widgetDefinition = defineWidget(
@@ -82,7 +82,7 @@ export const widgetDefinition = defineWidget(
     <NodeWidget v-if="operator" :input="WidgetInput.FromAst(operator)" />
     <AutoSizedInput
       v-model="displayedName"
-      class="FunctionName"
+      class="FunctionName widgetApplyPadding"
       @change="newNameAccepted"
       @pointerdown.stop
       @click.stop

app/gui2/src/stores/suggestionDatabase/index.ts

@@ -14,6 +14,7 @@ import {
 import { markRaw, proxyRefs, ref, type Ref } from 'vue'
 import { LanguageServer } from 'ydoc-shared/languageServer'
 import type { MethodPointer } from 'ydoc-shared/languageServerTypes'
+import * as lsTypes from 'ydoc-shared/languageServerTypes/suggestions'
 import { exponentialBackoff } from 'ydoc-shared/util/net'
 
 export class SuggestionDb extends ReactiveDb<SuggestionId, SuggestionEntry> {
@@ -154,6 +155,22 @@ export const { provideFn: provideSuggestionDbStore, injectFn: useSuggestionDbSto
     const entries = new SuggestionDb()
     const groups = ref<Group[]>([])
 
+    /** Add an entry to the suggestion database. */
+    function mockSuggestion(entry: lsTypes.SuggestionEntry) {
+      const id = Math.max(...entries.nameToId.reverse.keys()) + 1
+      applyUpdates(
+        entries,
+        [
+          {
+            type: 'Add',
+            id,
+            suggestion: entry,
+          },
+        ],
+        groups.value,
+      )
+    }
+
     const _synchronizer = new Synchronizer(projectStore, entries, groups)
-    return proxyRefs({ entries: markRaw(entries), groups, _synchronizer })
+    return proxyRefs({ entries: markRaw(entries), groups, _synchronizer, mockSuggestion })
   })

app/gui2/src/util/ast/node.ts

@@ -58,6 +58,12 @@ export function primaryApplicationSubject(
   // Require at least one property access.
   if (accessChain.length === 0) return
   // The leftmost element must be an identifier or a placeholder.
-  if (!(subject instanceof Ast.Ident || subject instanceof Ast.Wildcard)) return
+  if (
+    !(
+      (subject instanceof Ast.Ident && !subject.isTypeOrConstructor()) ||
+      subject instanceof Ast.Wildcard
+    )
+  )
+    return
   return { subject: subject.id, accessChain: accessChain.map((ast) => ast.id) }
 }

app/ydoc-shared/src/ast/tree.ts

@@ -2224,6 +2224,10 @@ export class Ident extends Ast {
     return this.module.getToken(this.fields.get('token').node) as IdentifierToken
   }
 
+  isTypeOrConstructor(): boolean {
+    return /^[A-Z]/.test(this.token.code())
+  }
+
   static concrete(module: MutableModule, token: NodeChild<Token>) {
     const base = module.baseObject('Ident')
     const fields = composeFieldData(base, { token })

build.sbt

@@ -2872,7 +2872,7 @@ lazy val `std-benchmarks` = (project in file("std-bits/benchmarks"))
   .settings(
     frgaalJavaCompilerSetting,
     annotationProcSetting,
-    libraryDependencies ++= GraalVM.modules ++ GraalVM.langsPkgs ++ Seq(
+    libraryDependencies ++= GraalVM.modules ++ GraalVM.langsPkgs ++ GraalVM.toolsPkgs ++ Seq(
       "org.openjdk.jmh"      % "jmh-core"                 % jmhVersion,
       "org.openjdk.jmh"      % "jmh-generator-annprocess" % jmhVersion,
       "org.graalvm.polyglot" % "polyglot"                 % graalMavenPackagesVersion,
@@ -2895,14 +2895,23 @@ lazy val `std-benchmarks` = (project in file("std-bits/benchmarks"))
       "-J-Dpolyglotimpl.DisableClassPathIsolation=true",
       "-J-Dpolyglot.engine.WarnInterpreterOnly=false"
     ),
-    moduleDependencies := {
-      componentModulesIds.value ++ Seq(
+    modulePath := {
+      val allRuntimeMods = componentModulesPaths.value
+      val otherModIds = Seq(
         "org.slf4j" % "slf4j-nop" % slf4jVersion
       )
+      val requiredMods = JPMSUtils.filterModulesFromUpdate(
+        (Compile / update).value,
+        otherModIds,
+        streams.value.log,
+        shouldContainAll = true
+      )
+      allRuntimeMods ++ requiredMods
     },
     addModules := {
       val runtimeModuleName = (`runtime-fat-jar` / javaModuleName).value
-      Seq(runtimeModuleName)
+      val arrowModName      = (`runtime-language-arrow` / javaModuleName).value
+      Seq(runtimeModuleName, arrowModName)
     },
     addExports := {
       Map("org.slf4j.nop/org.slf4j.nop" -> Seq("org.slf4j"))
@@ -2937,6 +2946,10 @@ lazy val `std-benchmarks` = (project in file("std-bits/benchmarks"))
   )
   .dependsOn(`bench-processor`)
   .dependsOn(`runtime-fat-jar`)
+  .dependsOn(`ydoc-server`)
+  .dependsOn(`runtime-language-arrow`)
+  .dependsOn(`syntax-rust-definition`)
+  .dependsOn(`profiling-utils`)
   .dependsOn(`std-table` % "provided")
   .dependsOn(`std-base` % "provided")
   .dependsOn(`benchmark-java-helpers` % "provided")