Skip to content
This repository has been archived by the owner on Dec 28, 2021. It is now read-only.

Bump engine to 0.2.16 #1726

Merged
merged 6 commits into from
Jul 27, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,17 @@ these updates be shipped in a stable release before the end of the year.
- [New look of open project dialog.][1700]. Now it has "Open project" title on
the top.

#### Enso Compiler

- [Updated Enso engine to version 0.2.16][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).

<br/>

[1700]: https://github.com/enso-org/ide/pull/1700
[1726]: https://github.com/enso-org/ide/pull/1726

# Enso 2.0.0-alpha.10 (2021-07-23)

Expand Down
2 changes: 1 addition & 1 deletion src/js/lib/client/tasks/signArchives.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.15'
const ENGINE = '0.2.16'
const ID = '"Developer ID Application: New Byte Order Sp. z o. o. (NM77WTZJFQ)"'
// Placeholder name for temporary archives.
const tmpArchive = 'temporary_archive.zip'
Expand Down
2 changes: 1 addition & 1 deletion src/js/lib/project-manager/src/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ async function get_project_manager_url(): Promise<string> {
// 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.15'
const version = '0.2.16'
let base_url: string = 'https://github.com/enso-org/'
base_url += 'enso/releases/download/'
base_url += `enso-${version}/enso-project-manager-${version}`
Expand Down
15 changes: 11 additions & 4 deletions src/rust/ide/lib/enso-protocol/src/language_server/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -867,16 +867,23 @@ pub enum SuggestionEntry {
return_type : String,
scope : SuggestionEntryScope,
},
#[serde(rename_all="camelCase")]
Module {
module : String,
documentation : Option<String>,
reexport : Option<String>,
},
}

impl SuggestionEntry {
/// Get name of the suggested entity.
pub fn name(&self) -> &String {
match self {
Self::Atom {name,..} => name,
Self::Function {name,..} => name,
Self::Local {name,..} => name,
Self::Method {name,..} => name,
Self::Atom {name,..} => name,
Self::Function {name,..} => name,
Self::Local {name,..} => name,
Self::Method {name,..} => name,
Self::Module {module,..} => module,
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/rust/ide/src/controller/project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.15";
pub const ENGINE_VERSION_SUPPORTED : &str = "^0.2.16";

/// 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.15";
pub const ENGINE_VERSION_FOR_NEW_PROJECTS : &str = "0.2.16";
/// The minimum edition that is guaranteed to work with the IDE.
pub const MINIMUM_EDITION_SUPPORTED : &str = "2021.3";
pub const MINIMUM_EDITION_SUPPORTED : &str = "2021.4";

/// The name of the module initially opened in the project view.
///
Expand Down
1 change: 1 addition & 0 deletions src/rust/ide/src/ide/integration/project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1858,6 +1858,7 @@ impl SuggestionsProviderForView {
suggestion_database::entry::Kind::Function => "Function",
suggestion_database::entry::Kind::Local => "Local variable",
suggestion_database::entry::Kind::Method => "Method",
suggestion_database::entry::Kind::Module => "Module",
};
let code = suggestion.code_to_insert(None,true).code;
format!("{} `{}`\n\nNo documentation available", title,code)
Expand Down
12 changes: 11 additions & 1 deletion src/rust/ide/src/model/suggestion_database/entry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pub struct MissingThisOnMethod(pub String);
#[derive(Copy,Clone,Debug,Eq,PartialEq)]
#[allow(missing_docs)]
pub enum Kind {
Atom,Function,Local,Method
Atom,Function,Local,Method,Module
}

/// Describes the visibility range of some entry (i.e. identifier available as suggestion).
Expand Down Expand Up @@ -264,6 +264,16 @@ impl Entry {
kind : Kind::Local,
scope : Scope::InModule {range:scope.into()},
},
Module {module,documentation,..} => Self {
name : module.clone(),
arguments : default(),
module : module.try_into()?,
self_type : None,
documentation,
kind : Kind::Module,
scope : Scope::Everywhere,
return_type : "".to_string()
MichaelMauderer marked this conversation as resolved.
Show resolved Hide resolved
}
};
Ok(this)
}
Expand Down