Merge branch 'master' into feature/tab-preview-mode

packages/web/src/settings/SettingsModal.svelte

@@ -21,6 +21,7 @@
   import SqlEditor from '../query/SqlEditor.svelte';
   import {
     currentEditorFontSize,
+    currentEditorWrapEnabled,
     currentEditorTheme,
     currentEditorKeybindigMode,
     extensions,
@@ -163,6 +164,14 @@ ORDER BY
                 />
               </FormFieldTemplateLarge>
             </div>
+            <div class="col-3">
+              <FormFieldTemplateLarge label="Enable word wrap" type="combo">
+                <CheckboxField
+                  checked={$currentEditorWrapEnabled}
+                  on:change={e => ($currentEditorWrapEnabled = e.target.checked)}
+                />
+              </FormFieldTemplateLarge>
+            </div>
           </div>
         </svelte:fragment>
         <svelte:fragment slot="2">