diff --git a/gui/CHANGELOG.md b/gui/CHANGELOG.md index eddab99f890..bf6b6505c28 100644 --- a/gui/CHANGELOG.md +++ b/gui/CHANGELOG.md @@ -14,7 +14,7 @@ these updates be shipped in a stable release before the end of the year. #### Enso Compiler -- [Updated Enso engine to version 0.2.16][1726]. If you're interested in the +- [Updated Enso engine to version 0.2.19][1726]. If you're interested in the enhancements and fixes made to the Enso compiler, you can find out more details in [the engine release notes](https://github.com/enso-org/enso/blob/main/RELEASES.md). diff --git a/gui/src/js/lib/client/tasks/signArchives.js b/gui/src/js/lib/client/tasks/signArchives.js index d5ec0f934c9..3311cf07db2 100644 --- a/gui/src/js/lib/client/tasks/signArchives.js +++ b/gui/src/js/lib/client/tasks/signArchives.js @@ -22,7 +22,7 @@ const resRoot = path.join(contentRoot, 'Resources') // TODO: Refactor this once we have a better wau to get the used engine version. // See the tracking issue for more information https://github.com/enso-org/ide/issues/1359 -const ENGINE = '0.2.16' +const ENGINE = '0.2.19' const ID = '"Developer ID Application: New Byte Order Sp. z o. o. (NM77WTZJFQ)"' // Placeholder name for temporary archives. const tmpArchive = 'temporary_archive.zip' diff --git a/gui/src/js/lib/project-manager/src/build.ts b/gui/src/js/lib/project-manager/src/build.ts index 311a70ca2fa..4dd2a07d235 100644 --- a/gui/src/js/lib/project-manager/src/build.ts +++ b/gui/src/js/lib/project-manager/src/build.ts @@ -44,7 +44,7 @@ async function get_project_manager_url(): Promise { // This constant MUST be synchronized with `ENGINE` constant in src/js/lib/client/tasks/signArchives.js. // Also it is usually a good idea to synchronize it with `ENGINE_VERSION_FOR_NEW_PROJECTS` in // src/rust/ide/src/controller/project.rs. See also https://github.com/enso-org/ide/issues/1359 - const version = '0.2.16' + const version = '0.2.19' let base_url: string = 'https://github.com/enso-org/' base_url += 'enso/releases/download/' base_url += `enso-${version}/enso-project-manager-${version}` diff --git a/gui/src/js/package-lock.json b/gui/src/js/package-lock.json index 78ec1f006aa..22fdb505218 100644 --- a/gui/src/js/package-lock.json +++ b/gui/src/js/package-lock.json @@ -1740,9 +1740,9 @@ } }, "@octokit/openapi-types": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.2.0.tgz", - "integrity": "sha512-c4A1Xm0At+ypvBfEETREu519wLncJYQXvY+dBGg/V5YA51eg5EwdDsPPfcOMG0cuXscqRvsIgIySTmTJUdcTNA==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.3.0.tgz", + "integrity": "sha512-oz60hhL+mDsiOWhEwrj5aWXTOMVtQgcvP+sRzX4C3cH7WOK9QSAoEtjWh0HdOf6V3qpdgAmUMxnQPluzDWR7Fw==", "dev": true }, "@octokit/plugin-enterprise-rest": { @@ -1884,12 +1884,12 @@ } }, "@octokit/types": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.22.0.tgz", - "integrity": "sha512-Y8GR0BJHQDpO09qw/ZQpN+DXrFzCWaE0pvK4frDm3zJ+h99AktsFfBoDazbCtHxiL8d0jD8xRH4BeynlKLeChg==", + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.23.0.tgz", + "integrity": "sha512-eG3clC31GSS7K3oBK6C6o7wyXPrkP+mu++eus8CSZdpRytJ5PNszYxudOQ0spWZQ3S9KAtoTG6v1WK5prJcJrA==", "dev": true, "requires": { - "@octokit/openapi-types": "^9.2.0" + "@octokit/openapi-types": "^9.3.0" } }, "@protobufjs/aspromise": { @@ -7673,8 +7673,7 @@ "integrity": "sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw==", "optional": true, "requires": { - "cli-truncate": "^1.1.0", - "node-addon-api": "^1.6.3" + "cli-truncate": "^1.1.0" } }, "iconv-lite": { @@ -9697,10 +9696,9 @@ } }, "node-addon-api": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", - "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", - "optional": true + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" }, "node-fetch": { "version": "2.6.1", @@ -11891,11 +11889,6 @@ "yallist": "^4.0.0" } }, - "node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" - }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -12722,9 +12715,9 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, "tar": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.2.tgz", - "integrity": "sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.3.tgz", + "integrity": "sha512-3rUqwucgVZXTeyJyL2jqtUau8/8r54SioM1xj3AmTX3HnWQdj2AydfJ2qYYayPyIIznSplcvU9mhBb7dR2XF3w==", "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -14719,20 +14712,12 @@ "requires": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" - }, - "dependencies": { - "xmlbuilder": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" - } } }, "xmlbuilder": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", - "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", - "optional": true + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" }, "xmldom": { "version": "0.5.0", diff --git a/gui/src/rust/ide/lib/enso-protocol/src/language_server/types.rs b/gui/src/rust/ide/lib/enso-protocol/src/language_server/types.rs index cf4c1df413a..04adffb2f24 100644 --- a/gui/src/rust/ide/lib/enso-protocol/src/language_server/types.rs +++ b/gui/src/rust/ide/lib/enso-protocol/src/language_server/types.rs @@ -871,9 +871,10 @@ pub enum SuggestionEntry { }, #[serde(rename_all="camelCase")] Module { - module : String, - documentation : Option, - reexport : Option, + module : String, + documentation : Option, + documentation_html : Option, + reexport : Option, }, } diff --git a/gui/src/rust/ide/src/controller/project.rs b/gui/src/rust/ide/src/controller/project.rs index 0e3bce61c66..8b39445336c 100644 --- a/gui/src/rust/ide/src/controller/project.rs +++ b/gui/src/rust/ide/src/controller/project.rs @@ -25,14 +25,14 @@ pub const COMPILING_STDLIB_LABEL:&str = "Compiling standard library. It can take /// The requirements for Engine's version, in format understandable by /// [`semver::VersionReq::parse`]. -pub const ENGINE_VERSION_SUPPORTED : &str = "^0.2.16"; +pub const ENGINE_VERSION_SUPPORTED : &str = "^0.2.19"; /// The Engine version used in projects created in IDE. // Usually it is a good idea to synchronize this version with the bundled Engine version in // src/js/lib/project-manager/src/build.ts. See also https://github.com/enso-org/ide/issues/1359 -pub const ENGINE_VERSION_FOR_NEW_PROJECTS : &str = "0.2.16"; +pub const ENGINE_VERSION_FOR_NEW_PROJECTS : &str = "0.2.19"; /// The minimum edition that is guaranteed to work with the IDE. -pub const MINIMUM_EDITION_SUPPORTED : &str = "2021.4"; +pub const MINIMUM_EDITION_SUPPORTED : &str = "2021.6"; /// The name of the module initially opened in the project view. /// diff --git a/gui/src/rust/ide/src/model/suggestion_database/entry.rs b/gui/src/rust/ide/src/model/suggestion_database/entry.rs index 903cec3a87d..5f30068d253 100644 --- a/gui/src/rust/ide/src/model/suggestion_database/entry.rs +++ b/gui/src/rust/ide/src/model/suggestion_database/entry.rs @@ -266,15 +266,18 @@ impl Entry { kind : Kind::Local, scope : Scope::InModule {range:scope.into()}, }, - Module {module,documentation,..} => Self { - name : module.clone(), - arguments : default(), - module : module.clone().try_into()?, - self_type : None, - documentation_html : documentation, - kind : Kind::Module, - scope : Scope::Everywhere, - return_type : module + Module {module,documentation_html,..} => { + let module_name: module::QualifiedName = module.clone().try_into()?; + Self { + documentation_html, + name : module_name.id().name().into(), + arguments : default(), + module : module_name, + self_type : None, + kind : Kind::Module, + scope : Scope::Everywhere, + return_type : module + } } }; Ok(this)