Sequence Editor Auto-indent, Ground support #1425

goetzrrGit · 2024-08-14T18:23:58Z

Custom Folding:

Adds custom folding capabilities for commonly used code blocks (ground_block, ground_event, request, load, activate, metadata, models).
Enables nested folding for better code organization and readability.

Autocomplete:

Extends autocomplete functionality to include request, activate, load, ground_event, and ground_blocks.
Fixes minor bugs related to incorrect autocomplete suggestions.

Auto-Indent:

Implements basic auto-indent functionality for improved code formatting.
Future improvements may include support for conditionals and loops.
NOTE: We should expose this feature to the adaptation layer.

You can take this below sequence and play around with the folding

@ID ""

@METADATA "Key1" "Value"
@METADATA "Key2" "Value"
@METADATA "Key3" "Value"
@METADATA "Key4" "Value"
@METADATA "Key5" "Value"
@METADATA "Key6" "Value"

C @ACTIVATE("activate.name") 1 2 "3" # description
@ENGINE 1
@EPOCH ""
@MODEL "Variable" 0 "Offset"
@MODEL "Variable" 0 "Offset"

C @LOAD("load.name") 1 2 [21 22]
@EPOCH ""

C @GROUND_BLOCK("ground_block.name")
@MODEL "Variable" 0 "Offset"
@MODEL "Variable" 0 "Offset"

C @GROUND_EVENT("ground_block.name") 1 2
@METADATA "Key" "Value"
@MODEL "Variable" 0 "Offset"
@MODEL "Variable" 0 "Offset"

@GROUND_EPOCH("Name", "+0.00") @REQUEST_BEGIN("request.name")
  C SEQ_ECHO ""
  @METADATA "Key" "Value"
  @METADATA "Key1" "Value"
  @METADATA "Key2" "Value"
  @METADATA "Key3" "Value"
  
  C @GROUND_BLOCK("ground_block.name")
  
  C @LOAD("load.name")
  @ENGINE 1
  @MODEL "Variable" 0 "Offset"
  @MODEL "Variable" 0 "Offset"
  @MODEL "Variable" 0 "Offset"
@REQUEST_END
@METADATA "Key1" "Value"
@METADATA "Key2" "Value"
@METADATA "Key3" "Value"
@METADATA "Key4" "Value"
@METADATA "Key5" "Value"

duranb

If I just type "R", I'm only seeing "relative" as a suggestion. Once I type "RE", then I see the request suggestion. Is that intentional?

goetzrrGit · 2024-08-15T17:07:33Z

Yep, the user will almost always need to start a line with a time tag (C, R, E, A) so it should be showing up as the first thing when you type.

duranb

The /utilities/codemirror/custom-folder.ts file is getting a little more complicated. Would it be possible to start adding some unit tests for this?

goetzrrGit · 2024-08-15T17:51:52Z

Unit test will be kinda hard as it is returning a fold range which will be hard to calculate on a treenode.

duranb · 2024-08-15T18:23:36Z

I see. There's no way to manually create the tree given some test input code the way it's done in the editor?

Added custom folding for ground_block, ground_event, request, load, activate, metadata, models You can now nest folding to collapse huge blocks of code

* Can now auto-complete request, activate, load, ground_event, and ground_blocks, * Improve some minor bugs with autocomplete giving wrong suggestions when the user is typing a comment

We can expand on this for conditional and loops in the future. We also need to probably expose this to the adaptation so missions can override this behavior.

duranb

lgtm! thank you!

src/utilities/codemirror/custom-folder.ts

src/utilities/sequence-editor/sequence-completion.ts

goetzrrGit · 2024-08-19T15:51:36Z

@duranb @cohansen Let me know if the PR is good to merge now. I took @cohansen suggestions am using the foldSteps method for Activte, Load, Commands, GroundBlock, and GroundEvent and removed foldCommand, foldLoadandActivate, and foldGround with this commit: fbb48c8

cohansen · 2024-08-19T16:05:14Z

@duranb @cohansen Let me know if the PR is good to merge now. I took @cohansen suggestions am using the foldSteps method for Activte, Load, Commands, GroundBlock, and GroundEvent and removed foldCommand, foldLoadandActivate, and foldGround with this commit: fbb48c8

LGTM, thanks @goetzrrGit .

duranb · 2024-08-19T16:18:42Z

@duranb @cohansen Let me know if the PR is good to merge now. I took @cohansen suggestions am using the foldSteps method for Activte, Load, Commands, GroundBlock, and GroundEvent and removed foldCommand, foldLoadandActivate, and foldGround with this commit: fbb48c8

LGTM, thanks @goetzrrGit .

Great catch! Merge away!

* Added custom folding Added custom folding for ground_block, ground_event, request, load, activate, metadata, models You can now nest folding to collapse huge blocks of code * Update auto-complete * Can now auto-complete request, activate, load, ground_event, and ground_blocks, * Improve some minor bugs with autocomplete giving wrong suggestions when the user is typing a comment * Add auto-indent capabilities to the editor. We can expand on this for conditional and loops in the future. We also need to probably expose this to the adaptation so missions can override this behavior. * add unit test for custom folding * Update Custom Folding

goetzrrGit added feature New feature or request sequencing Anything related to the sequencing domain labels Aug 14, 2024

goetzrrGit requested a review from a team as a code owner August 14, 2024 18:23

goetzrrGit requested review from AaronPlave, duranb and joswig August 14, 2024 18:24

goetzrrGit temporarily deployed to test-workflow August 14, 2024 18:25 — with GitHub Actions Inactive

duranb reviewed Aug 15, 2024

View reviewed changes

goetzrrGit force-pushed the feature/improved-code-formatting branch from 3aaffdc to 32fa2ff Compare August 15, 2024 17:51

goetzrrGit temporarily deployed to test-workflow August 15, 2024 17:51 — with GitHub Actions Inactive

goetzrrGit temporarily deployed to test-workflow August 16, 2024 20:08 — with GitHub Actions Inactive

goetzrrGit added 3 commits August 16, 2024 10:10

Added custom folding

cdc1d40

Added custom folding for ground_block, ground_event, request, load, activate, metadata, models You can now nest folding to collapse huge blocks of code

Update auto-complete

cfdaaaf

* Can now auto-complete request, activate, load, ground_event, and ground_blocks, * Improve some minor bugs with autocomplete giving wrong suggestions when the user is typing a comment

Add auto-indent capabilities to the editor.

0d6daeb

We can expand on this for conditional and loops in the future. We also need to probably expose this to the adaptation so missions can override this behavior.

goetzrrGit force-pushed the feature/improved-code-formatting branch from 7201da5 to 3c965bd Compare August 16, 2024 20:11

goetzrrGit temporarily deployed to test-workflow August 16, 2024 20:11 — with GitHub Actions Inactive

add unit test for custom folding

78f3951

goetzrrGit force-pushed the feature/improved-code-formatting branch from 3c965bd to 78f3951 Compare August 16, 2024 20:55

goetzrrGit temporarily deployed to test-workflow August 16, 2024 20:55 — with GitHub Actions Inactive

duranb approved these changes Aug 16, 2024

View reviewed changes

dandelany mentioned this pull request Aug 16, 2024

Route Phoenix editor auto indent and completion through adaptation logic #1430

Closed

cohansen approved these changes Aug 16, 2024

View reviewed changes

src/utilities/codemirror/custom-folder.ts Outdated Show resolved Hide resolved

src/utilities/sequence-editor/sequence-completion.ts Outdated Show resolved Hide resolved

goetzrrGit temporarily deployed to test-workflow August 19, 2024 15:47 — with GitHub Actions Inactive

goetzrrGit force-pushed the feature/improved-code-formatting branch from 372d630 to 2b0313c Compare August 19, 2024 15:48

goetzrrGit temporarily deployed to test-workflow August 19, 2024 15:48 — with GitHub Actions Inactive

Update Custom Folding

fbb48c8

goetzrrGit force-pushed the feature/improved-code-formatting branch from 2b0313c to fbb48c8 Compare August 19, 2024 15:49

goetzrrGit temporarily deployed to test-workflow August 19, 2024 15:49 — with GitHub Actions Inactive

goetzrrGit merged commit 9526bea into develop Aug 19, 2024
5 checks passed

goetzrrGit deleted the feature/improved-code-formatting branch August 19, 2024 16:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sequence Editor Auto-indent, Ground support #1425

Sequence Editor Auto-indent, Ground support #1425

goetzrrGit commented Aug 14, 2024 •

edited

Loading

duranb left a comment

goetzrrGit commented Aug 15, 2024

duranb left a comment •

edited

Loading

goetzrrGit commented Aug 15, 2024

duranb commented Aug 15, 2024

duranb left a comment

goetzrrGit commented Aug 19, 2024 •

edited

Loading

cohansen commented Aug 19, 2024

duranb commented Aug 19, 2024

Sequence Editor Auto-indent, Ground support #1425

Sequence Editor Auto-indent, Ground support #1425

Conversation

goetzrrGit commented Aug 14, 2024 • edited Loading

duranb left a comment

Choose a reason for hiding this comment

goetzrrGit commented Aug 15, 2024

duranb left a comment • edited Loading

Choose a reason for hiding this comment

goetzrrGit commented Aug 15, 2024

duranb commented Aug 15, 2024

duranb left a comment

Choose a reason for hiding this comment

goetzrrGit commented Aug 19, 2024 • edited Loading

cohansen commented Aug 19, 2024

duranb commented Aug 19, 2024

goetzrrGit commented Aug 14, 2024 •

edited

Loading

duranb left a comment •

edited

Loading

goetzrrGit commented Aug 19, 2024 •

edited

Loading