Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactored enso-data crate and text utilities. #3166

Merged
merged 20 commits into from
Nov 25, 2021
Merged

Refactored enso-data crate and text utilities. #3166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
237db53
Wip
farmaazon Nov 15, 2021
b1183a3
Move parts of esogl_text to a separate crate
farmaazon Nov 15, 2021
b08aae1
WIP
farmaazon Nov 15, 2021
677e2ce
WIP
farmaazon Nov 18, 2021
7e38904
Used Codepoints offset everywhere so far
farmaazon Nov 19, 2021
2152cd1
WIP
farmaazon Nov 19, 2021
a437748
It seems idmap and area input is working
farmaazon Nov 19, 2021
06c3feb
Apparently not
farmaazon Nov 19, 2021
4cde484
Fix module synchronized model compilation
farmaazon Nov 22, 2021
84ba684
It compiles
farmaazon Nov 22, 2021
9f3c088
Test compiles
farmaazon Nov 22, 2021
657b5bf
Native tests pass
farmaazon Nov 23, 2021
ec1f5d0
Fixed wasm-bindgen tests
farmaazon Nov 23, 2021
e38be3e
Added missing docs
farmaazon Nov 23, 2021
bccbed5
Renamed enso-data to enso-data-structures
farmaazon Nov 23, 2021
0976b04
Removed text module
farmaazon Nov 23, 2021
105f4dd
Self-review + linter
farmaazon Nov 23, 2021
a470a34
Merge remote-tracking branch 'origin/develop' into wip/ao/refactoring…
farmaazon Nov 23, 2021
d784207
Review fixes
farmaazon Nov 24, 2021
68be107
Review fixes
farmaazon Nov 24, 2021
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
40 changes: 30 additions & 10 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ members = [
"lib/rust/callback",
"lib/rust/code-builder",
"lib/rust/config-reader",
"lib/rust/data",
"lib/rust/data-structures",
"lib/rust/ensogl",
"lib/rust/ensogl/app/theme/hardcoded",
"lib/rust/ensogl/core",
Expand Down Expand Up @@ -54,6 +54,7 @@ members = [
"lib/rust/shapely/macros",
"lib/rust/shortcuts",
"lib/rust/shortcuts/example",
"lib/rust/text",
"lib/rust/types",
"lib/rust/web",
"lib/rust/not-used/eval-tt",
Expand Down
4 changes: 4 additions & 0 deletions app/gui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#### Visual Environment

- [Fixed histograms coloring and added a color legend.][3153]
- [Fixed broken node whose expression contains non-ASCII characters.][3166]

[3153]: https://github.com/enso-org/enso/pull/3153
[3166]: https://github.com/enso-org/enso/pull/3166

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

Expand Down
3 changes: 2 additions & 1 deletion app/gui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ analytics = { version = "0.1.0", path = "analytics" }
double-representation = { version = "0.1.0", path = "controller/double-representation" }
enso-config = { path = "config" }
enso-callback = { path = "../../lib/rust/callback" }
enso-data = { path = "../../lib/rust/data"}
enso-data-structures = { path = "../../lib/rust/data-structures" }
enso-frp = { path = "../../lib/rust/frp" }
enso-logger = { path = "../../lib/rust/logger"}
enso-prelude = { path = "../../lib/rust/prelude"}
enso-shapely = { path = "../../lib/rust/shapely/impl"}
enso-text = { path = "../../lib/rust/text" }
enso-web = { path = "../../lib/rust/web" }
ensogl = { path = "../../lib/rust/ensogl" }
ensogl-examples = { path = "../../lib/rust/ensogl/example" }
Expand Down
3 changes: 2 additions & 1 deletion app/gui/controller/double-representation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ crate-type = ["cdylib", "rlib"]
ast = { version = "0.1.0", path = "../../language/ast/impl" }
engine-protocol = { version = "0.1.0", path = "../engine-protocol" }
parser = { version = "0.1.0", path = "../../language/parser" }
enso-data = { path = "../../../../lib/rust/data"}
enso-data-structures = { path = "../../../../lib/rust/data-structures" }
enso-logger = { path = "../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../lib/rust/prelude"}
enso-text = { path = "../../../../lib/rust/text" }
failure = { version = "0.1.6" }
itertools = { version = "0.10.0" }
serde = { version = "1.0", features = ["derive"] }
Expand Down
5 changes: 3 additions & 2 deletions app/gui/controller/double-representation/src/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use ast::crumbs::ModuleCrumb;
use ast::known;
use ast::BlockLine;
use engine_protocol::language_server;
use enso_text::unit::*;
use serde::Deserialize;
use serde::Serialize;

Expand Down Expand Up @@ -754,9 +755,9 @@ pub fn lookup_method(
pub fn definition_span(
ast: &known::Module,
id: &definition::Id,
) -> FallibleResult<enso_data::text::Span> {
) -> FallibleResult<enso_text::Range<Bytes>> {
let location = locate(ast, id)?;
ast.span_of_descendent_at(&location.crumbs)
ast.range_of_descendant_at(&location.crumbs)
}

impl DefinitionProvider for known::Module {
Expand Down
Loading