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

Syntax highlighting #691

Merged
merged 12 commits into from
Dec 30, 2019
Merged

Syntax highlighting #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c87f4b5
Syntax highlighting mostly... Exists.
epsilon-phase Nov 5, 2019
cac3806
Add dependency to dockerfile
epsilon-phase Nov 5, 2019
6ed6854
Handle non-existent languages better
epsilon-phase Nov 6, 2019
fd70c89
Make the default a bit nicer
epsilon-phase Nov 6, 2019
3b96aa6
Improve highlighting. Clean up function
epsilon-phase Nov 7, 2019
cc41cc1
Add dark theme, add the comment scope to the allowed classes
epsilon-phase Nov 8, 2019
b929174
update build env
epsilon-phase Dec 24, 2019
5706924
Merge branch 'syntax-highlighting' of github.com:epsilon-phase/Plume …
epsilon-phase Dec 24, 2019
0a69d5c
Merge master
epsilon-phase Dec 24, 2019
3154dee
Address review comments
epsilon-phase Dec 28, 2019
6666155
Use find_syntax_by_token which produces the desired behavior
epsilon-phase Dec 28, 2019
91a1496
Change flat_map into flatten
epsilon-phase Dec 28, 2019
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ executors:
type: boolean
default: false
docker:
- image: plumeorg/plume-buildenv:v0.0.7
- image: plumeorg/plume-buildenv:v0.0.8
- image: <<#parameters.postgres>>circleci/postgres:9.6-alpine<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
environment:
POSTGRES_USER: postgres
Expand Down Expand Up @@ -82,7 +82,7 @@ commands:
type: string
steps:
- run: zip -0 ccov.zip `find . -name 'plume*.gc*' -o -name 'plm*.gc*'`
- run: grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore-dir '/*' -o lcov.info
- run: grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore '/*' -o lcov.info
- run: bash <(curl -s https://codecov.io/bash) -f lcov.info -F <<parameters.type>>
- run: find . -name 'plume*.gc*' -delete -o -name 'plm*.gc*' -delete
- run: rm ccov.zip lcov.info
Expand Down
2 changes: 1 addition & 1 deletion .circleci/images/plume-buildenv/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
#install native/circleci/build dependancies
RUN apt update &&\
apt install -y --no-install-recommends git ssh tar gzip ca-certificates default-jre&&\
apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip &&\
apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip libclang-dev&&\
rm -rf /var/lib/apt/lists/*

#install and configure rust
Expand Down
Loading