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

Issue 2 #3

Merged
merged 103 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
5b0eb6d
First draft
Ateyu Aug 7, 2024
3729c2f
Grammar covers synatax. Not tested yet.
Ateyu Aug 9, 2024
8910e09
Add: First draft of the editor. Open and writing works.
Ateyu Aug 9, 2024
865e293
add: Button to save the file
Ateyu Aug 15, 2024
bf8a4d4
add: update structure
Ateyu Aug 20, 2024
ea78945
fix: file saving didnt save current state
Ateyu Aug 20, 2024
f2a52b2
add: lit element containing the editor, load button and save button
Ateyu Aug 21, 2024
005745c
feat: change body from script editor to lit component containing the …
Ateyu Aug 21, 2024
5902811
add: adding completions export for testing. Designed to be added to l…
Ateyu Aug 22, 2024
2543400
feat: EditorView tested and errors spotted
Ateyu Aug 22, 2024
9df170b
feat: updated
Ateyu Aug 22, 2024
11b3564
feat: main file for language package controlling language form parser…
Ateyu Aug 22, 2024
c621150
feat: rm unnecessary features
Ateyu Aug 22, 2024
60d3465
add: update structure
Ateyu Aug 22, 2024
1f85bf9
feat: adding basic autocompletion to language
Ateyu Aug 22, 2024
2e1c02e
doc: adding intentions for the highlighting
Ateyu Aug 22, 2024
1b02e4a
fix: removing parser features form file to keep the editor running
Ateyu Aug 22, 2024
6840d6e
add: adding a save and load button for the editor. Passed first tests
Ateyu Aug 22, 2024
29e497a
feat: adding description
Ateyu Aug 22, 2024
5463fcf
feat: adding highlighting and parser for editor
Ateyu Aug 27, 2024
65a52ff
feat: cleanup
Ateyu Aug 27, 2024
f6e43ff
doc: adding explanations for the functions
Ateyu Aug 27, 2024
48dc374
feat: updating autocompletion and removing old completion
Ateyu Aug 27, 2024
84398be
feat: reinstall to guarantee that the dependencies are right
Ateyu Aug 27, 2024
b565c8b
add: updating autocompletion
Ateyu Aug 28, 2024
296b030
add: no idea
Ateyu Aug 28, 2024
1c9af18
feat: adding linebreak
Ateyu Aug 29, 2024
e14a6ff
feat: changing the grammar to include &, ! and () and additional high…
Ateyu Aug 30, 2024
0c387c7
add: adding lit to build the editor and buttons
Ateyu Aug 30, 2024
223047c
add: adding first draft of error handling to the language.mjs
Ateyu Aug 30, 2024
3e3a9d3
feat: updating comments
Ateyu Aug 30, 2024
34289fc
feat: new error linting prototype
Ateyu Aug 30, 2024
41c9f99
feat: updating theme
Ateyu Aug 30, 2024
c1ff7a0
feat: changing to valid html syntax
Ateyu Aug 31, 2024
4925620
add: adding tokens to enable Indentation parser
Ateyu Sep 2, 2024
4c585fc
fix: changing imports
Ateyu Sep 2, 2024
ed66ede
feat: changing to import lang.terms.mjs. File is not included (best p…
Ateyu Sep 2, 2024
76c7316
feat: changing tokens
Ateyu Sep 2, 2024
b427b73
fix: browser slowing down. Reverting grammar. Highlighting needs to b…
Ateyu Sep 2, 2024
84937a3
feat: adapt highlighting to new grammar
Ateyu Sep 2, 2024
4ba9024
fix: Error highlighting at every error of the tree
Ateyu Sep 2, 2024
f9393d3
fix: cleanup files. Removing prototypes and broken code of Error high…
Ateyu Sep 2, 2024
ac0352b
feat: better error highlighting
Ateyu Sep 3, 2024
f6acfa6
feat: applying the error highlighting for the new grammar
Ateyu Sep 5, 2024
96f8ad5
feat: applying new highlighting
Ateyu Sep 5, 2024
c063ae2
feat: adding parser generator and cleaning up
Ateyu Sep 5, 2024
f1b5bdf
fix: refactoring
Ateyu Sep 5, 2024
4c58a17
fix: removing customAutocompletion from Editor to enable Constraints
Ateyu Sep 6, 2024
b6992d4
fix: features without "" are now better highlighted
Ateyu Sep 6, 2024
325642c
fix: build process and dependencies adjusted
Ateyu Sep 6, 2024
b74102f
fix: len() is working now
Ateyu Sep 7, 2024
8d5c8e3
fix: adding parser temporary to repo to enable editor. Error recreati…
Ateyu Sep 7, 2024
be15bec
fix: Key Value adjustment for all Features. Value is optional.
Ateyu Sep 8, 2024
3aeebf6
Issue 2 + 5 (#7)
h3ssto Sep 9, 2024
e8e3f7a
added branch triage for deploy
Sep 9, 2024
693c02c
added branch triage for deploy
Sep 9, 2024
14b3800
fix: updating grammar
Ateyu Sep 10, 2024
624f809
fix: constraints operator
Ateyu Sep 10, 2024
f472a07
fix: restrict feature names
Ateyu Sep 10, 2024
d29a11e
fix: too many brackets
Ateyu Sep 10, 2024
f181feb
feat: applying keymap
Ateyu Sep 10, 2024
2375395
feat: adding new error cases
Ateyu Sep 10, 2024
43fda2b
feat: update doc example
Ateyu Sep 11, 2024
28ba8af
feat: update error detection
Ateyu Sep 11, 2024
0422647
Merge remote-tracking branch 'origin/nightly' into issue-2
Ateyu Sep 11, 2024
1f0c3c3
feat: updating dependencies
Ateyu Sep 11, 2024
55f47b5
add: adding test file with basic structure
Ateyu Sep 11, 2024
e188f39
feat: adding ToDO
Ateyu Sep 11, 2024
03d4e84
feat: adapting grammar to examples. Adding boolean as values and feat…
Ateyu Sep 11, 2024
53834c1
feat: constraints specifier update
Ateyu Sep 11, 2024
34b2762
fix: fixing counter. i.e. bike.uvl
Ateyu Sep 11, 2024
6e72905
fix: fixing hierarchy of Types
Ateyu Sep 11, 2024
5176b68
fix: test.mjs to compile
Ateyu Sep 11, 2024
61d79ef
feat: mjs to start running tests. js to bundle (needs to be fixed)
Ateyu Sep 11, 2024
43548e0
feat: update Tokens for new grammar and future updates
Ateyu Sep 11, 2024
042e55f
fix: .js -> .mjs
Ateyu Sep 11, 2024
57b0a43
feat: fixed and tested with examples
Ateyu Sep 12, 2024
4941f8f
feat: doc changes for testing
Ateyu Sep 13, 2024
af55aa0
fix: changing tokes to public tokens
Ateyu Sep 13, 2024
e52bd6a
feat: constraints support
Ateyu Sep 13, 2024
9df5fd3
feat: adding feature error highlighting
Ateyu Sep 13, 2024
317fc55
feat: adding first steps for operator syntax
Ateyu Sep 13, 2024
b6832bc
fix: adjusting to bundle
Ateyu Sep 13, 2024
d4ce8a0
feat: adding feature.key error
Ateyu Sep 13, 2024
464c899
feat: adding counter error
Ateyu Sep 14, 2024
5071649
fix: fixing counter to allow min = max
Ateyu Sep 14, 2024
bcea8c4
feat: adding operator error
Ateyu Sep 14, 2024
1942e81
feat: adding highlighting
Ateyu Sep 14, 2024
4e0dbc0
add: adding tab size = 4
Ateyu Sep 14, 2024
8181489
fix: removing outdated functions
Ateyu Sep 14, 2024
1156d4a
fix: @codemirror/commands got an update and does not work like before…
Ateyu Sep 17, 2024
dd44211
feat: duplicated key disabled
Ateyu Sep 17, 2024
e55e8f9
feat: duplicated feature disabled
Ateyu Sep 17, 2024
b23a414
feat: feature check in operation added
Ateyu Sep 18, 2024
525c560
Issue 4 (#9)
Ateyu Sep 19, 2024
03e6c38
fix: Neg to BooleanNeg
Ateyu Sep 19, 2024
d2e6d57
fix: remove unnecessary files
Ateyu Sep 19, 2024
71235be
feat: avg, sum and len only for keys like the old editor
Ateyu Sep 19, 2024
96188f8
feat: clearing precedence, restructuring and cleanup
Ateyu Sep 21, 2024
ebc01dd
feat: avg and sum only for numbers
Ateyu Sep 21, 2024
f872aaf
Merge remote-tracking branch 'origin/main' into issue-2
Ateyu Sep 21, 2024
cc5d9f0
fix: removing old code
Ateyu Sep 21, 2024
ac014b0
feat: adapting tests
Ateyu Oct 1, 2024
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
41 changes: 32 additions & 9 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Node.js CI
name: CI/CD

on:
workflow_dispatch:
push:
branches: [ "*" ]
pull_request:
branches: [ "main" ]
branches: [ "nightly", "stable", "main" ]

jobs:
build:
Expand All @@ -28,12 +28,35 @@ jobs:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm run build --if-present
# - run: npm test TODO: See #issue-4
- run: npm run build
- run: npm run test
- name: Archive production artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-pages-artifact@v3
with:
name: dist-without-markdown
path: |
dist
!dist/**/*.md
name: github-pages
path: dist

deploy:

# FIXME: Change me to stable when ready
if: github.ref == 'refs/heads/nightly'

# Add a dependency to the build job
needs: build

# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
pages: write # to deploy to Pages
id-token: write # to verify the deployment originates from an appropriate source

# Deploy to the github-pages environment
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

# Specify runner + deployment step
runs-on: ubuntu-latest
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
12 changes: 12 additions & 0 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<title>Editor</title>
<meta charset=utf8>
</head>
<body>
<h1>Editor</h1>
<script src="../src/editor.bundle.js"></script>
<code-mirror-editor></code-mirror-editor>
</body>
</html>
12 changes: 12 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<title>Editor</title>
<meta charset=utf8>
</head>
<body>
<h1>Editor</h1>
<script src="src/editor.bundle.js"></script>
<code-mirror-editor></code-mirror-editor>
</body>
</html>
Loading