Skip to content

Commit

Permalink
feat: add indentation guide line in text mode (fixes #225)
Browse files Browse the repository at this point in the history
  • Loading branch information
@josdejong
josdejong committed Feb 16, 2023
1 parent 4ef9b9a commit 09f2575
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 10 deletions.
17 changes: 17 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"@fontsource/fira-mono": "^4.5.10",
"@fortawesome/free-regular-svg-icons": "^6.3.0",
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@replit/codemirror-indentation-markers": "6.3.0",
"ajv": "^8.12.0",
"codemirror": "^6.0.1",
"diff-sequences": "^29.4.2",
Expand Down
30 changes: 20 additions & 10 deletions src/lib/components/__snapshots__/JSONEditor.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -907,12 +907,14 @@ exports[`JSONEditor > render text mode 1`] = `
[
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch"
>
{
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch,var(--indent-marker-bg-part) 2.5ch"
>
<span
Expand All @@ -928,17 +930,20 @@ exports[`JSONEditor > render text mode 1`] = `
</span>
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch"
>
},
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch"
>
{
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch,var(--indent-marker-bg-part) 2.5ch"
>
<span
Expand All @@ -955,7 +960,8 @@ exports[`JSONEditor > render text mode 1`] = `
,
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch,var(--indent-marker-bg-part) 2.5ch"
>
<span
Expand All @@ -971,17 +977,20 @@ exports[`JSONEditor > render text mode 1`] = `
</span>
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch"
>
},
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch"
>
{
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch,var(--indent-marker-bg-part) 2.5ch"
>
<span
Expand All @@ -997,7 +1006,8 @@ exports[`JSONEditor > render text mode 1`] = `
</span>
</div>
<div
class="cm-line"
class="cm-indent-markers cm-line"
style="--indent-markers: var(--indent-marker-active-bg-part) 0.5ch"
>
}
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/lib/components/modes/textmode/TextMode.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import { truncate } from '$lib/utils/stringUtils.js'
import { needsFormatting } from '$lib/utils/jsonUtils.js'
import { faJSONEditorFormat } from '$lib/img/customFontawesomeIcons.js'
import { indentationMarkers } from '@replit/codemirror-indentation-markers'
export let readOnly: boolean
export let mainMenuBar: boolean
Expand Down Expand Up @@ -491,6 +492,7 @@
lintGutter(),
basicSetup,
highlighter,
indentationMarkers(),
EditorView.domEventHandlers({
dblclick: handleDoubleClick
}),
Expand Down

0 comments on commit 09f2575

Please sign in to comment.