Skip to content

Commit 34ddd37

Browse files
authored
Add Missing_Argument error to join right (#11888)
1 parent 269354e commit 34ddd37

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

app/gui/src/project-view/util/callTree.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ import type { WidgetConfiguration } from '@/providers/widgetRegistry/configurati
44
import * as widgetCfg from '@/providers/widgetRegistry/configuration'
55
import { DisplayMode } from '@/providers/widgetRegistry/configuration'
66
import type { MethodCallInfo } from '@/stores/graph/graphDatabase'
7-
import type { SuggestionEntry, SuggestionEntryArgument } from '@/stores/suggestionDatabase/entry'
7+
import {
8+
isRequiredArgument,
9+
type SuggestionEntry,
10+
type SuggestionEntryArgument,
11+
} from '@/stores/suggestionDatabase/entry'
812
import { Ast } from '@/util/ast'
913
import type { AstId } from '@/util/ast/abstract'
1014
import { findLastIndex, tryGetIndex } from '@/util/data/array'
@@ -118,7 +122,7 @@ export class ArgumentPlaceholder extends Argument {
118122

119123
/** TODO: Add docs */
120124
override get hideByDefault(): boolean {
121-
return this.argInfo.hasDefault && this.dynamicConfig?.display !== DisplayMode.Always
125+
return !isRequiredArgument(this.argInfo) && this.dynamicConfig?.display !== DisplayMode.Always
122126
}
123127
}
124128

distribution/lib/Standard/Database/0.0.0-dev/src/DB_Table.enso

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Standard.Base.Errors.Common.Floating_Point_Equality
99
import Standard.Base.Errors.Common.Incomparable_Values
1010
import Standard.Base.Errors.Common.Index_Out_Of_Bounds
1111
import Standard.Base.Errors.Common.Type_Error
12+
import Standard.Base.Errors.Common.Missing_Argument
1213
import Standard.Base.Errors.Deprecated.Deprecated
1314
import Standard.Base.Errors.File_Error.File_Error
1415
import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
@@ -1495,7 +1496,7 @@ type DB_Table
14951496
@join_kind Widget_Helpers.make_join_kind_selector
14961497
@on Widget_Helpers.make_join_condition_selector
14971498
join : DB_Table -> Join_Kind -> Join_Condition | Text | Vector (Join_Condition | Text) -> Text -> Problem_Behavior -> DB_Table
1498-
join self right (join_kind : Join_Kind = ..Left_Outer) (on : Join_Condition | Text | Vector (Join_Condition | Text) = (default_join_condition self join_kind)) (right_prefix:Text="Right ") (on_problems:Problem_Behavior=..Report_Warning) =
1499+
join self right=(Missing_Argument.throw "right") (join_kind : Join_Kind = ..Left_Outer) (on : Join_Condition | Text | Vector (Join_Condition | Text) = (default_join_condition self join_kind)) (right_prefix:Text="Right ") (on_problems:Problem_Behavior=..Report_Warning) =
14991500
Feature.Join.if_supported_else_throw self.connection.dialect "join" <|
15001501
self.join_or_cross_join right join_kind on right_prefix on_problems
15011502

distribution/lib/Standard/Table/0.0.0-dev/src/Table.enso

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Standard.Base.Errors.Common.Additional_Warnings
88
import Standard.Base.Errors.Common.Floating_Point_Equality
99
import Standard.Base.Errors.Common.Incomparable_Values
1010
import Standard.Base.Errors.Common.Index_Out_Of_Bounds
11+
import Standard.Base.Errors.Common.Missing_Argument
1112
import Standard.Base.Errors.Common.No_Such_Method
1213
import Standard.Base.Errors.Common.Out_Of_Memory
1314
import Standard.Base.Errors.Common.Type_Error
@@ -2665,7 +2666,7 @@ type Table
26652666
@join_kind Widget_Helpers.make_join_kind_selector
26662667
@on Widget_Helpers.make_join_condition_selector
26672668
join : Table -> Join_Kind -> Vector (Join_Condition | Text) | Text -> Text -> Problem_Behavior -> Table
2668-
join self right:Table (join_kind : Join_Kind = ..Left_Outer) on=[Join_Condition.Equals self.column_names.first] right_prefix:Text="Right " on_problems:Problem_Behavior=..Report_Warning = Out_Of_Memory.handle_java_exception "join" <|
2669+
join self right:Table=(Missing_Argument.throw "right") (join_kind : Join_Kind = ..Left_Outer) on=[Join_Condition.Equals self.column_names.first] right_prefix:Text="Right " on_problems:Problem_Behavior=..Report_Warning = Out_Of_Memory.handle_java_exception "join" <|
26692670
columns_to_keep = case join_kind of
26702671
Join_Kind.Left_Exclusive -> [True, False]
26712672
Join_Kind.Right_Exclusive -> [False, True]

0 commit comments

Comments
 (0)