This repository has been archived by the owner on Dec 28, 2021. It is now read-only.
Comments on nodes #1744
Merged
Comments on nodes #1744
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
farmaazon
reviewed
Jul 30, 2021
| @@ -0,0 +1,33 @@ | |||
| use crate::prelude::*; | |||
|
|
|||
| // FIXME move to other parser-related tests | |||
There was a problem hiding this comment.
Remember to remove ALL Fixmes
| @@ -287,7 +466,7 @@ mod tests { | |||
| let larg = Ast::var("foo"); | |||
| let rarg = Ast::var("bar").with_id(id); | |||
| let line_ast = Ast::infix(larg,ASSIGNMENT,rarg); | |||
| let mut node = NodeInfo::from_line_ast(&line_ast).unwrap(); | |||
| let mut node = NodeInfo::from_main_line_ast(&line_ast).unwrap(); | |||
|
|
|||
| assert_eq!(node.repr(), "foo = bar"); | |||
| assert_eq!(node.id(),id); | |||
There was a problem hiding this comment.
Test for iterating over nodes in line list.
…n-nodes # Conflicts: # src/rust/ide/src/double_representation/connection.rs # src/rust/ide/src/double_representation/node.rs # src/rust/ide/src/double_representation/refactorings/collapse.rs
farmaazon
approved these changes
Aug 2, 2021
| @@ -630,7 +640,6 @@ pub struct BlockLine <T> { | |||
| } | |||
|
|
|||
|
|
|||
|
|
|||
src/rust/ide/lib/ast/impl/src/lib.rs
Outdated
Comment on lines
1229
to
1242
| impl <T> BlockLine<Option<T>> { | ||
| pub fn transpose(self) -> Option<BlockLine<T>> { | ||
| let off = self.off; | ||
| self.elem.map(|elem| BlockLine {elem,off}) | ||
| } | ||
|
|
||
| pub fn transpose_ref(&self) -> Option<BlockLine<&T>> { | ||
| self.as_ref().map(Option::as_ref).transpose() | ||
| } | ||
|
|
||
| pub fn map_opt<U>(self, f:impl FnOnce(T) -> U) -> BlockLine<Option<U>> { | ||
| self.map(|elem| elem.map(f)) | ||
| } | ||
| } |
There was a problem hiding this comment.
Do you have warnings about missing documentation?
Comment on lines
+1269
to
+1274
| /// Iterate over non-empty lines, while keeping their absolute indices. | ||
| pub fn enumerate_non_empty_lines(&self) -> impl Iterator<Item=(usize,BlockLine<&T>)> + '_ { | ||
| self.iter_all_lines().enumerate().filter_map(|(index,line):(usize,BlockLine<Option<&T>>)| { | ||
| let non_empty_line = line.transpose()?; | ||
| Some((index, non_empty_line)) | ||
| }) |
There was a problem hiding this comment.
Why we cannot use non-associated enumerate_non_empty_lines here?
src/rust/ide/src/controller/graph.rs
Outdated
| @@ -664,7 +657,10 @@ impl Handle { | |||
| false | |||
| } | |||
| }; | |||
| let range = NodeIndex::range(node_to_be_after.index,node_to_be_before.index); | |||
|
|
|||
| // FIXME block lines are not necessarily in a block | |||
MichaelMauderer
added a commit
that referenced
this pull request
Aug 5, 2021
This reverts commit fdeed13.
mwu-tow
added a commit
to enso-org/enso
that referenced
this pull request
Oct 30, 2021
mwu-tow
pushed a commit
to enso-org/enso
that referenced
this pull request
Oct 30, 2021
This reverts commit f30fb17. Original commit: enso-org/ide@36a2242
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Description
Important Notes
Checklist
Please include the following checklist in your PR:
CHANGELOG.mdwas updated with the changes introduced in this PR.