8000 Code structure highlighting: collapse implementations before adding m… · pdg137/python-editor-next@e84b83e · GitHub
[go: up one dir, main page]
Skip to content

Commit e84b83e

Browse files
microbit-matt-hillsdonmicrobit-matt-hillsdon
authored
Code structure highlighting: collapse implementations before adding more config (microbit-foundation#209)
This removes the "brackets" implementation that we've decided against progressing and collapses the code that implements the remaining approaches into a single parameterised implementation. We lean more heavily on CSS, but there is a fundamental difference between l-shapes and boxes that needs switching in the view code. The new parameters are not yet exposed to the user. Combinations of parameters that aren't surfaced through the settings will need careful review after this PR. Folks who previously had brackets enabled will just get no highlighting for now (probably no-one). Various tidying / splitting up of the code. See microbit-foundation#207 I've been testing this with the default theme and it also fixes microbit-foundation#204.
1 parent 16f7c6b commit e84b83e

File tree

13 files changed

+458
-857
lines changed

13 files changed

+458
-857
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ _steps:
3333
install_dependencies: &install_dependencies
3434
run: npm ci --cache .npm-cache && sudo npm i -g --registry https://npm.pkg.github.com/microbit-foundation @microbit-foundation/website-deploy-aws@0.2.0 @microbit-foundation/website-deploy-aws-config@0.4.2 @microbit-foundation/circleci-npm-package-versioner@1
3535
install_theme: &install_theme
36-
run: npm install --no-save --registry https://npm.pkg.github.com/microbit-foundation @microbit-foundation/python-editor-next-microbit@0.1.0-dev.35
36+
run: npm install --no-save --registry https://npm.pkg.github.com/microbit-foundation @microbit-foundation/python-editor-next-microbit@0.1.0-dev.37
3737
update_version: &update_version
3838
run: npm run ci:update-version
3939
build: &build

‎src/deployment/default/colors.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const colors = {
1515
gray,
1616
code: {
1717
block: "rgba(52, 162, 235, 0.06)",
18+
border: theme.colors.gray[400],
1819
comment: "gray",
1920
default: "black",
2021
keyword: "darkblue",

‎src/editor/codemirror/structure-highlighting/boxes.ts

Lines changed: 0 additions & 188 deletions
This file was deleted.

‎src/editor/codemirror/structure-highlighting/brackets.ts

Lines changed: 0 additions & 181 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0