Merge branch 'develop' into wip/sb/dashboard-tests

.github/workflows/enso4igv.yml

@@ -1,7 +1,4 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Enso Language Support for IGV
+name: Enso Language Support for VSCode, IGV, NetBeans
 
 on:
   push:
@@ -30,7 +27,7 @@ jobs:
       - name: Update project version
         working-directory: tools/enso4igv
         run: |
-          mvn versions:set -DnewVersion=`mvn -q -DforceStdout help:evaluate -Dexpression=project.version | cut -f1 -d -`.$GITHUB_RUN_NUMBER
+          mvn versions:set -DnewVersion=`mvn -q -DforceStdout help:evaluate -Dexpression=project.version | cut -f1 -d -`.`expr $GITHUB_RUN_NUMBER - 1666`
 
       - name: Build with Maven
         run: mvn -B -Pvsix package --file tools/enso4igv/pom.xml
@@ -43,5 +40,14 @@ jobs:
       - name: Install Node.js modules
         run: mvn -B -Pvsix npm:install --file tools/enso4igv/pom.xml
 
+      - name: Update package.json version
+        run: mvn -B -Pvsix npm:exec@version --file tools/enso4igv/pom.xml
+
       - name: Build VSCode Extension
         run: mvn -B -Pvsix npm:run@vsix --file tools/enso4igv/pom.xml
+
+      - name: Archive VSCode extension
+        uses: actions/upload-artifact@v3
+        with:
+          name: VSCode Extension
+          path: tools/enso4igv/*.vsix

.github/workflows/gui.yml

@@ -24,7 +24,7 @@ jobs:
           conda-channels: anaconda, conda-forge
       - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')
         name: Installing wasm-pack
-        uses: jetli/wasm-pack-action@v0.3.0
+        uses: jetli/wasm-pack-action@v0.4.0
         with:
           version: v0.10.2
       - name: Expose Artifact API and context information.

.gitignore

@@ -70,6 +70,7 @@ node_modules/
 .enso-sources*
 .metals
 tools/performance/engine-benchmarks/generated_site
+*.tsbuildinfo
 
 ############################
 ## Rendered Documentation ##
@@ -108,7 +109,7 @@ bench-report*.xml
 .bloop/
 .bsp/
 project/metals.sbt
-/app/ide-desktop/build.json
+/build.json
 /app/ide-desktop/lib/client/electron-builder-config.json
 
 

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

.prettierignore

@@ -26,12 +26,15 @@ test/**/data
 **/msdfgen_wasm.js
 
 # Generated files
-app/ide-desktop/build.json
 app/ide-desktop/lib/client/electron-builder-config.json
+app/ide-desktop/lib/content-config/src/config.json
 app/ide-desktop/lib/dashboard/playwright-report/
 app/ide-desktop/lib/dashboard/playwright/.cache/
 app/gui/view/documentation/assets/stylesheet.css
+app/gui2/rust-ffi/pkg
 Cargo.lock
+build.json
+app/gui2/playwright-report/
 
 # Engine Builds can leave these nested working copies.
 # TODO [mwu]: Adjust Engine build to not leave them.

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Listen to 5005",
+      "type": "java+",
+      "request": "attach",
+      "listen": "true",
+      "hostName": "localhost",
+      "port": "5005"
+    },
+    {
+      "name": "Debug Adapter Protocol",
+      "type": "node",
+      "debugServer": 4711,
+      "request": "attach"
+    }
+  ]
+}

.vscode/settings.json

@@ -5,5 +5,18 @@
   "vue.complete.casing.tags": "pascal",
   "auto-snippets.snippets": [
     { "language": "vue", "snippet": "Vue single-file component" }
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "eslint.experimental.useFlatConfig": true,
+  "eslint.useESLintClass": true,
+  "[javascript][typescript][typescriptreact][vue]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+  },
+  "eslint.workingDirectories": [
+    "./app/gui2",
+    "./app/gui2/ide-desktop"
+  ],
+  "files.watcherExclude": {
+    "**/target": true
+  }
 }

CHANGELOG.md

@@ -308,6 +308,9 @@
   centered and the delay before showing them was extended.
 - [Accurate GPU performance measurements have been implemented][6595]. It is
   possible now to track both the time spent on both the CPU and the GPU sides.
+- [Support recovery from GL context loss][7662]. This allows the application to
+  continue after an interruption to rendering, such as hibernation or movement
+  of the application window to a display rendered by a different GPU.
 
 [3857]: https://github.com/enso-org/enso/pull/3857
 [3985]: https://github.com/enso-org/enso/pull/3985
@@ -323,6 +326,7 @@
 [6595]: https://github.com/enso-org/enso/pull/6595
 [6487]: https://github.com/enso-org/enso/pull/6487
 [6512]: https://github.com/enso-org/enso/pull/6512
+[7662]: https://github.com/enso-org/enso/pull/7662
 
 #### Enso Standard Library
 
@@ -569,6 +573,11 @@
   `Column.map` and `Column.zip`.][7637]
 - [Added `delete_rows` method to Database Table, changed the
   `update_database_table` API into `update_rows`.][7709]
+- [Added `Data.post` method to write to HTTP endpoints.][7700]
+- [Added support for S3. Using `Input_Stream` more for reading.][7776]
+- [Renamed `Decimal` to `Float`.][7807]
+- [Implemented `Date_Time_Formatter` for more user-friendly date/time format
+  parsing.][7826]
 
 [debug-shortcuts]:
   https://github.com/enso-org/enso/blob/develop/app/gui/docs/product/shortcuts.md#debug
@@ -806,7 +815,11 @@
 [7704]: https://github.com/enso-org/enso/pull/7704
 [7615]: https://github.com/enso-org/enso/pull/7615
 [7637]: https://github.com/enso-org/enso/pull/7637
+[7700]: https://github.com/enso-org/enso/pull/7700
 [7709]: https://github.com/enso-org/enso/pull/7709
+[7776]: https://github.com/enso-org/enso/pull/7776
+[7807]: https://github.com/enso-org/enso/pull/7807
+[7826]: https://github.com/enso-org/enso/pull/7826
 
 #### Enso Compiler
 
@@ -917,6 +930,7 @@
 - [Warning.get_all returns only unique warnings][6372]
 - [Reimplement `enso_project` as a proper builtin][6352]
 - [Limit number of reported warnings per value][6577]
+- [Experimental support for Espresso Java interpreter][6966]
 - [Suggestions are updated only when the type of the expression changes][6755]
 - [Add project creation time to project metadata][6780]
 - [Upgrade GraalVM to 22.3.1 JDK17][6750]
@@ -947,6 +961,10 @@
   projects next to each other][7634]
 - [Support runtime checks of intersection types][7769]
 - [Merge `Small_Integer` and `Big_Integer` types][7636]
+- [Inline type ascriptions][7796]
+- [Always persist `TRACE` level logs to a file][7825]
+- [Downloadable VSCode extension][7861]
+- [New `project/status` route for reporting LS state][7801]
 
 [3227]: https://github.com/enso-org/enso/pull/3227
 [3248]: https://github.com/enso-org/enso/pull/3248
@@ -1057,6 +1075,7 @@
 [6372]: https://github.com/enso-org/enso/pull/6372
 [6352]: https://github.com/enso-org/enso/pull/6352
 [6577]: https://github.com/enso-org/enso/pull/6577
+[6966]: https://github.com/enso-org/enso/pull/6966
 [6750]: https://github.com/enso-org/enso/pull/6750
 [6755]: https://github.com/enso-org/enso/pull/6755
 [6780]: https://github.com/enso-org/enso/pull/6780
@@ -1086,6 +1105,10 @@
 [7634]: https://github.com/enso-org/enso/pull/7634
 [7769]: https://github.com/enso-org/enso/pull/7769
 [7636]: https://github.com/enso-org/enso/pull/7636
+[7796]: https://github.com/enso-org/enso/pull/7796
+[7801]: https://github.com/enso-org/enso/pull/7801
+[7825]: https://github.com/enso-org/enso/pull/7825
+[7861]: https://github.com/enso-org/enso/pull/7861
 
 # Enso 2.0.0-alpha.18 (2021-10-12)
 

Cargo.toml

@@ -10,6 +10,7 @@ members = [
   "app/gui",
   "app/gui/language/parser",
   "app/gui/enso-profiler-enso-data",
+  "app/gui2/rust-ffi",
   "build/cli",
   "build/macros/proc-macro",
   "build/ci-gen",
@@ -93,7 +94,7 @@ serde-wasm-bindgen = { version = "0.4.5" }
 tokio = { version = "1.23.0", features = ["full", "tracing"] }
 tokio-stream = { version = "0.1.12", features = ["fs"] }
 tokio-util = { version = "0.7.4", features = ["full"] }
-wasm-bindgen = { version = "0.2.84", features = [] }
+wasm-bindgen = { version = "0.2.87", features = [] }
 wasm-bindgen-test = { version = "0.3.34" }
 anyhow = { version = "1.0.66" }
 failure = { version = "0.1.8" }

app/gui/docs/product/shortcuts.md

@@ -141,4 +141,5 @@ broken and require further investigation.
 | <kbd>ctrl</kbd> + <kbd>shift</kbd> + <kbd>arrow up</kbd>           | Pop a breadcrumb without navigating.                                                                                           |
 | <kbd>cmd</kbd> + <kbd>i</kbd>                                      | Reload visualizations. To see the effect in the currently shown visualizations, you need to switch to another and switch back. |
 | <kbd>ctrl</kbd> + <kbd>shift</kbd> + <kbd>b</kbd>                  | Toggle read-only mode.                                                                                                         |
+| <kbd>ctrl</kbd> + <kbd>alt</kbd> + <kbd>shift</kbd> + <kbd>x</kbd> | Toggle WebGL Context loss / restoration for testing.                                                                           |
 | <kbd>ctrl</kbd> + <kbd>shift</kbd> + <kbd>u</kbd>                  | Dump the suggestion database as JSON to the console. Available only in debug mode, and only if the component browser is open.  |

app/gui/language/span-tree/src/action.rs

@@ -125,16 +125,21 @@ impl<'a> Implementation for node::Ref<'a> {
                 let mut inserted_positional_placeholder_at = None;
                 let new_ast = modify_preserving_id(ast, |ast| {
                     if let Some(mut infix) = extended_infix {
-                        let item = ArgWithOffset { arg: new, offset: DEFAULT_OFFSET };
-                        let has_target = infix.target.is_some();
                         let has_arg = infix.args.last().unwrap().operand.is_some();
+                        let offset = infix
+                            .enumerate_non_empty_operands()
+                            .last()
+                            .map_or(DEFAULT_OFFSET, |op| op.offset);
                         let last_elem = infix.args.last_mut().unwrap();
+                        let item = ArgWithOffset { arg: new, offset };
+                        let has_target = infix.target.is_some();
                         last_elem.offset = DEFAULT_OFFSET;
                         match kind {
+                            ExpectedTarget => infix.target = Some(item),
                             BeforeArgument(0 | 1) if !has_target => infix.target = Some(item),
                             BeforeArgument(idx) => infix.insert_operand(*idx, item),
                             Append if has_arg => infix.push_operand(item),
-                            Append => last_elem.operand = Some(item),
+                            Append | ExpectedOperand => last_elem.operand = Some(item),
                             ExpectedArgument { .. } => unreachable!(
                                 "Expected arguments should be filtered out before this if block"
                             ),
@@ -183,6 +188,8 @@ impl<'a> Implementation for node::Ref<'a> {
                                 };
                                 prefix.args.push(item)
                             }
+                            ExpectedTarget | ExpectedOperand =>
+                                unreachable!("Wrong insertion point in method call"),
                         }
                         Ok(prefix.into_ast())
                     }