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.

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

FCPL branch enhancements #1455

Merged
merged 20 commits into from
Sep 26, 2024
Merged

FCPL branch enhancements #1455

merged 20 commits into from
Sep 26, 2024

Conversation

joswig
Copy link
Collaborator

@joswig joswig commented Sep 9, 2024

resolves #1412

SeqN/FCPL

  • Folding
  • Highlighting
  • Linting well formed
  • Auto-indent

I've deferred reorganizing some code to minimize merge conflicts with other work in progress. There will be a different PR for VML implementation

Requires testing with new Clipper or Psyche adaptation (from Cody)

@joswig
Copy link
Collaborator Author

joswig commented Sep 9, 2024

code_folding_blocks.mov

@joswig joswig changed the title SeqN branch enhancements FCPL branch enhancements Sep 9, 2024
@joswig
Copy link
Collaborator Author

joswig commented Sep 13, 2024

block_highlighting.mov

@joswig joswig marked this pull request as ready for review September 17, 2024 00:27
@joswig joswig requested a review from a team as a code owner September 17, 2024 00:27
@joswig joswig requested a review from goetzrrGit September 17, 2024 00:28
@joswig joswig removed the DON'T MERGE Do Not Merge This Branch label Sep 18, 2024
@joswig joswig requested review from cohansen and duranb September 18, 2024 00:36
src/utilities/codemirror/custom-folder.ts Outdated Show resolved Hide resolved
src/utilities/codemirror/custom-folder.ts Outdated Show resolved Hide resolved
src/utilities/codemirror/custom-folder.ts Outdated Show resolved Hide resolved
@shaheerk94
Copy link

@joswig To work with psyche, we'll need the user versions of each of these commands in this block:

const SEQ_DIR_END_IF = 'SEQ_DIR_END_IF';
const SEQ_DIR_IF = 'SEQ_DIR_IF';
const SEQ_DIR_IF_OR = 'SEQ_DIR_IF_OR';
const SEQ_DIR_IF_AND = 'SEQ_DIR_IF_AND';
const SEQ_DIR_ELSE = 'SEQ_DIR_ELSE';
const SEQ_DIR_END_WAIT_UNTIL = 'SEQ_DIR_END_WAIT_UNTIL';
const SEQ_DIR_WAIT_UNTIL = 'SEQ_DIR_WAIT_UNTIL';
const SEQ_DIR_WAIT_UNTIL_VAR = 'SEQ_DIR_WAIT_UNTIL_VAR';
const SEQ_DIR_WAIT_UNTIL_AND = 'SEQ_DIR_WAIT_UNTIL_AND';
const SEQ_DIR_WAIT_UNTIL_OR = 'SEQ_DIR_WAIT_UNTIL_OR';
const SEQ_DIR_WAIT_UNTIL_TIMEOUT = 'SEQ_DIR_WAIT_UNTIL_TIMEOUT';
const SEQ_DIR_END_LOOP = 'SEQ_DIR_END_LOOP';
const SEQ_DIR_LOOP = 'SEQ_DIR_LOOP';
const SEQ_DIR_WHILE_LOOP = 'SEQ_DIR_WHILE_LOOP';
const SEQ_DIR_WHILE_LOOP_AND = 'SEQ_DIR_WHILE_LOOP_AND';
const SEQ_DIR_WHILE_LOOP_OR = 'SEQ_DIR_WHILE_LOOP_OR';
const SEQ_DIR_END_WHILE_LOOP = 'SEQ_DIR_END_WHILE_LOOP';

Copy link
Contributor

@cohansen cohansen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@joswig joswig requested a review from duranb September 26, 2024 17:21
Copy link
Collaborator

@duranb duranb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@joswig joswig merged commit ed2d2b6 into develop Sep 26, 2024
5 checks passed
@joswig joswig deleted the feat/folding_conditionals_and_loops branch September 26, 2024 18:39
JosephVolosin pushed a commit that referenced this pull request Oct 21, 2024
* folding for seqN conditionals, waits, and loops

* outlining of paired blocks, may change definition of paired

* highlight if, else, end together

* added linting for block structure

* auto-indent blocks and fix folding when there's indentation

* only show last unclosed block error

* removed some unused parameters

* support alternate loop construct names

* clear selection after indent on open, make function return types explicit

* better variable name and remove unused parameter

* more detailed parameter name, explicit return types

* restore branch structure checking

* removed some unused parameters

* create USER_ stems
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants