Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(ls): remove if referentialIntegrity preview feature flag #1288

Merged
merged 4 commits into from
Nov 24, 2022
Merged

chore(ls): remove if referentialIntegrity preview feature flag #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75fdd79
chore(ls): remove if `referentialIntegrity` preview feature flag
Jolg42 Nov 15, 2022
ecf4ef9
comment unused code line
Jolg42 Nov 15, 2022
5b4d52f
remove 1 unneeded test
Jolg42 Nov 15, 2022
b01df6b
Merge branch 'main' into joel/remove-referentialIntegrity-flag
Jolg42 Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 0 additions & 14 deletions packages/language-server/src/__test__/completion.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@ suite('Completions', function () {

test('relationMode = "|"', () => {
assertCompletion({
previewFeatures: ['referentialIntegrity'],
schema: /* Prisma */ `
datasource db {
provider = "sqlite"
Expand All @@ -365,7 +364,6 @@ suite('Completions', function () {
})
test('relationMode = |', () => {
assertCompletion({
previewFeatures: ['referentialIntegrity'],
schema: /* Prisma */ `
datasource db {
relationMode = |
Expand All @@ -376,18 +374,6 @@ suite('Completions', function () {
},
})
})
test('relationMode = | (without previewFeature)', () => {
assertCompletion({
schema: /* Prisma */ `
datasource db {
relationMode = |
}`,
expected: {
isIncomplete: false,
items: [],
},
})
})
})

suite('GENERATOR BLOCK', () => {
Expand Down
9 changes: 2 additions & 7 deletions packages/language-server/src/completion/completions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ export function getSuggestionForSupportedFields(
// We can filter on the datasource
const datasourceProvider = getFirstDatasourceProvider(lines)
// We can filter on the previewFeatures enabled
const previewFeatures = getAllPreviewFeaturesFromGenerators(lines)
// const previewFeatures = getAllPreviewFeaturesFromGenerators(lines)

switch (blockType) {
case 'generator':
Expand Down Expand Up @@ -450,12 +450,7 @@ export function getSuggestionForSupportedFields(
}
}
// `relationMode` can only be set for SQL databases
// TODO remove conditional on preview feature flag when going GA
else if (
previewFeatures?.includes('referentialintegrity') &&
currentLine.startsWith('relationMode') &&
datasourceProvider !== 'mongodb'
) {
else if (currentLine.startsWith('relationMode') && datasourceProvider !== 'mongodb') {
const relationModeValuesSuggestion: CompletionItem[] = relationModeValues
// values inside quotes `"value"`
const relationModeValuesSuggestionWithQuotes: CompletionItem[] = klona(relationModeValuesSuggestion).map(
Expand Down
2 changes: 1 addition & 1 deletion packages/language-server/src/previewFeatures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export type PreviewFeatures =
// value must be lowercase
Lowercase<'fullTextIndex'> | Lowercase<'referentialIntegrity'>
Lowercase<'fullTextIndex'>