Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into wip/jtulach/Import…
Browse files Browse the repository at this point in the history
…ExportWithMain
  • Loading branch information
JaroslavTulach committed Jun 9, 2023
2 parents dfd116a + 372bc8f commit 1d0bc04
Show file tree
Hide file tree
Showing 400 changed files with 11,442 additions and 6,117 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@
- [A loading animation is now shown when opening and creating projects][6827],
as the previous behaviour of showing a blank screen while the project was
being loaded was potentially confusing to users.
- [Performance and readability of documentation panel was improved][6893]. The
documentation is now split into separate pages, which are much smaller.

[6279]: https://github.com/enso-org/enso/pull/6279
[6421]: https://github.com/enso-org/enso/pull/6421
Expand All @@ -191,6 +193,7 @@
[6474]: https://github.com/enso-org/enso/pull/6474
[6844]: https://github.com/enso-org/enso/pull/6844
[6827]: https://github.com/enso-org/enso/pull/6827
[6893]: https://github.com/enso-org/enso/pull/6893

#### EnsoGL (rendering engine)

Expand Down Expand Up @@ -470,6 +473,15 @@
- [Added `Date_Range`.][6621]
- [Implemented the `cast` operation for `Table` and `Column`.][6711]
- [Added `.round` and `.int` to `Integer` and `Decimal`.][6743]
- [Added `.round`, `.truncate`, `.ceil`, and `.floor` to `Column`.][6817]
- [Added execution control to `Table.write` and various bug fixes.][6835]
- [Implemented `Table.add_row_number`.][6890]
- [Handling edge cases in rounding.][6922]
- [Split `Table.create_database_table` into `Connection.create_table` and
`Table.select_into_database_table`.][6925]
- [Speed improvements to `Column` `.truncate`, `.ceil`, and `.floor`.][6941]
- [Implemented addition and subtraction for `Date_Period` and
`Time_Period`.][6956]

[debug-shortcuts]:
https://github.com/enso-org/enso/blob/develop/app/gui/docs/product/shortcuts.md#debug
Expand Down Expand Up @@ -682,6 +694,13 @@
[6621]: https://github.com/enso-org/enso/pull/6621
[6711]: https://github.com/enso-org/enso/pull/6711
[6743]: https://github.com/enso-org/enso/pull/6743
[6817]: https://github.com/enso-org/enso/pull/6817
[6835]: https://github.com/enso-org/enso/pull/6835
[6890]: https://github.com/enso-org/enso/pull/6890
[6922]: https://github.com/enso-org/enso/pull/6922
[6925]: https://github.com/enso-org/enso/pull/6925
[6941]: https://github.com/enso-org/enso/pull/6941
[6956]: https://github.com/enso-org/enso/pull/6956

#### Enso Compiler

Expand Down Expand Up @@ -796,6 +815,7 @@
- [Add project creation time to project metadata][6780]
- [Upgrade GraalVM to 22.3.1 JDK17][6750]
- [Ascribed types are checked during runtime][6790]
- [Improve and colorize compiler's diagnostic messages][6931]

[3227]: https://github.com/enso-org/enso/pull/3227
[3248]: https://github.com/enso-org/enso/pull/3248
Expand Down Expand Up @@ -910,6 +930,7 @@
[6755]: https://github.com/enso-org/enso/pull/6755
[6780]: https://github.com/enso-org/enso/pull/6780
[6790]: https://github.com/enso-org/enso/pull/6790
[6931]: https://github.com/enso-org/enso/pull/6931

# Enso 2.0.0-alpha.18 (2021-10-12)

Expand Down
14 changes: 14 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/gui/controller/engine-protocol/src/language_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ trait API {
/// Create a new execution context. Return capabilities executionContext/canModify and
/// executionContext/receivesUpdates containing freshly created ContextId
#[MethodInput=CreateExecutionContextInput, rpc_name="executionContext/create"]
fn create_execution_context(&self) -> response::CreateExecutionContext;
fn create_execution_context(&self, context_id: ContextId) -> response::CreateExecutionContext;

/// Destroy an execution context and free its resources.
#[MethodInput=DestroyExecutionContextInput, rpc_name="executionContext/destroy"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ fn test_computed_value_update() {
let update = &expression_updates.updates.first().unwrap();
assert_eq!(update.expression_id, id);
assert_eq!(update.typename.as_deref(), Some(typename));
assert!(update.method_pointer.is_none());
assert!(update.method_call.is_none());
assert!(update.from_cache);
assert!(matches!(update.payload, ExpressionUpdatePayload::Value { warnings: None }))
}
Expand All @@ -373,9 +373,9 @@ fn test_execution_context() {
let create_execution_context_response =
response::CreateExecutionContext { context_id, can_modify, receives_updates };
test_request(
|client| client.create_execution_context(),
|client| client.create_execution_context(&context_id),
"executionContext/create",
json!({}),
json!({"contextId":"00000000-0000-0000-0000-000000000000"}),
json!({
"contextId" : "00000000-0000-0000-0000-000000000000",
"canModify" : {
Expand Down
20 changes: 15 additions & 5 deletions app/gui/controller/engine-protocol/src/language_server/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ pub struct ExpressionUpdate {
pub expression_id: ExpressionId,
#[serde(rename = "type")] // To avoid collision with the `type` keyword.
pub typename: Option<String>,
pub method_pointer: Option<MethodPointer>,
pub method_call: Option<MethodCall>,
pub profiling_info: Vec<ProfilingInfo>,
pub from_cache: bool,
pub payload: ExpressionUpdatePayload,
Expand Down Expand Up @@ -740,6 +740,16 @@ pub struct MethodPointer {
pub name: String,
}

/// A representation of a method call.
#[derive(Hash, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct MethodCall {
/// The method pointer of a call.
pub method_pointer: MethodPointer,
/// Indexes of arguments that have not been applied to this method.
pub not_applied_arguments: Vec<usize>,
}

/// Used for entering a method. The first item on the execution context stack should always be
/// an `ExplicitCall`.
#[derive(Hash, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
Expand Down Expand Up @@ -1226,7 +1236,7 @@ pub mod test {
ExpressionUpdate {
expression_id: id,
typename: Some(typename.into()),
method_pointer: None,
method_call: None,
profiling_info: default(),
from_cache: false,
payload: ExpressionUpdatePayload::Value { warnings: None },
Expand All @@ -1242,7 +1252,7 @@ pub mod test {
ExpressionUpdate {
expression_id: id,
typename: None,
method_pointer: Some(method_pointer),
method_call: Some(MethodCall { method_pointer, not_applied_arguments: vec![] }),
profiling_info: default(),
from_cache: false,
payload: ExpressionUpdatePayload::Value { warnings: None },
Expand All @@ -1256,7 +1266,7 @@ pub mod test {
ExpressionUpdate {
expression_id: id,
typename: None,
method_pointer: None,
method_call: None,
profiling_info: default(),
from_cache: false,
payload: ExpressionUpdatePayload::DataflowError { trace },
Expand All @@ -1274,7 +1284,7 @@ pub mod test {
ExpressionUpdate {
expression_id: id,
typename: None,
method_pointer: None,
method_call: None,
profiling_info: default(),
from_cache: false,
payload: ExpressionUpdatePayload::Panic { trace, message },
Expand Down
Loading

0 comments on commit 1d0bc04

Please sign in to comment.