fix: merge local and engines completions

[Druue]

closes #1347

[github-actions]

🤖 Pull request artifacts

file	commit
pr1348-prisma.vsix	45e8ba2

[github-actions]

Try this extension build via GitPod

[Jolg42]

Suggested change

	if (prismaFmt === undefined && local === undefined) {
	return undefined
	}
	if (prismaFmt !== undefined && local === undefined) {
	return prismaFmt
	}
	if (prismaFmt === undefined && local !== undefined) {
	return local
	}
	return {
	isIncomplete: false,
	items: prismaFmt!.items.concat(local!.items),
	}
	if (prismaFmt && local) {
	return {
	isIncomplete: false,
	items: [...prismaFmt.items, ...local.items],
	}
	} else if (prismaFmt) {
	return prismaFmt
	} else if (local) {
	return local
	}
	return undefined

Maybe this instead?

[Jolg42]

It looks like the tests are failing currently, so I think we cannot merge the completions for now until we figure out how to resolve this

[Druue]

It looks like the tests are failing currently, so I think we cannot merge the completions for now until we figure out how to resolve this

Yeah! The tests are currently failing due to not expecting certain completions to be available but they all of a sudden are. I'd hedge that this is more than updating the expects of the test suites and rather, being more specific about when completions will be available.

As an example, looking at the test for @@index

[Jolg42]

After taking another look at the test failures

for @@index([title], type: |)
Before we were suggesting

         "Gist"
         "Gin"
         "SpGist"
         "Brin"

and now only the following, which is less correct

         "Gist"
         "Gin"
         "SpGist"
         "Brin"
         "fields"
         "map"

for @@index([title(ops: |)]) (and similar):
Before we were suggesting

          "raw"

and now only raw, which is less correct

          "raw"
         "ops"
         "sort"

for @relation(onDelete: |) (and similar) :
Before we were suggesting

          "Restrict"
         "NoAction"
         "SetNull"
         "SetDefault"

and now only the referential actions, which is less correct

          "Restrict"
         "NoAction"
         "SetNull"
         "SetDefault"
         "references"
         "fields"
         "onDelete"
         "onUpdate"
         "\"\""
         "name"
         "map"

[Jolg42]

I think we can avoid/delay this work if instead of prisma/prisma-engines#3541 we open a TypeScript PR so we can have all datasource completions on one side. It's quite easy to do, only need to change the completions.json file here

language-tools/packages/language-server/src/completion/completions.json

Line 70 in 0409258

"dataSourceFields": [

It will also have the benefit of working from the beginning of the line. (Bug in rust code is tracked here: prisma/prisma#17000)