feat: add indentation on wrapped lines (#295)

josdejong · Sep 13, 2023 · 367accf · 367accf
1 parent e57f471
commit 367accf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -83,6 +83,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@replit/codemirror-indentation-markers": "6.4.3",
     "ajv": "^8.12.0",
+    "codemirror-wrapped-line-indent": "^0.0.2",
     "diff-sequences": "^29.6.3",
     "immutable-json-patch": "^5.1.3",
     "jmespath": "^0.16.0",

diff --git a/src/lib/components/modes/textmode/TextMode.svelte b/src/lib/components/modes/textmode/TextMode.svelte
@@ -115,6 +115,7 @@
   import { faJSONEditorFormat } from '$lib/img/customFontawesomeIcons.js'
   import { indentationMarkers } from '@replit/codemirror-indentation-markers'
   import { isTextSelection } from '$lib/logic/selection.js'
+  import { wrappedLineIndent } from 'codemirror-wrapped-line-indent'
 
   export let readOnly: boolean
   export let mainMenuBar: boolean
@@ -594,7 +595,8 @@
         tabSizeCompartment.of(EditorState.tabSize.of(tabSize)),
         indentUnitCompartment.of(createIndentUnit(indentation)),
         themeCompartment.of(EditorView.theme({}, { dark: hasDarkTheme() })),
-        EditorView.lineWrapping
+        EditorView.lineWrapping,
+        wrappedLineIndent
       ]
     })
 
@@ -748,7 +750,7 @@
     }
 
     const codeMirrorText = getCodeMirrorValue()
-
+    
     const isChanged = codeMirrorText !== text
     debug('onChangeCodeMirrorValue', { isChanged })
     if (!isChanged) {