Skip to content

Commit fe50830

Browse files
amedoraRokt33r
authored andcommitted
make lineWrapping configurable
1 parent 4e30d4b commit fe50830

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

browser/components/CodeEditor.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export default class CodeEditor extends React.Component {
251251
value: this.props.value,
252252
linesHighlighted: this.props.linesHighlighted,
253253
lineNumbers: this.props.displayLineNumbers,
254-
lineWrapping: true,
254+
lineWrapping: this.props.lineWrapping,
255255
theme: this.props.theme,
256256
indentUnit: this.props.indentSize,
257257
tabSize: this.props.indentSize,
@@ -550,6 +550,10 @@ export default class CodeEditor extends React.Component {
550550
this.editor.setOption('lineNumbers', this.props.displayLineNumbers)
551551
}
552552

553+
if (prevProps.lineWrapping !== this.props.lineWrapping) {
554+
this.editor.setOption('lineWrapping', this.props.lineWrapping)
555+
}
556+
553557
if (prevProps.scrollPastEnd !== this.props.scrollPastEnd) {
554558
this.editor.setOption('scrollPastEnd', this.props.scrollPastEnd)
555559
}

browser/main/Detail/SnippetNoteDetail.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,7 @@ class SnippetNoteDetail extends React.Component {
720720
mode={snippet.mode || (autoDetect ? null : config.editor.snippetDefaultLanguage)}
721721
value={snippet.content}
722722
linesHighlighted={snippet.linesHighlighted}
723+
lineWrapping={config.editor.lineWrapping}
723724
theme={config.editor.theme}
724725
fontFamily={config.editor.fontFamily}
725726
fontSize={editorFontSize}

browser/main/lib/ConfigManager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export const DEFAULT_CONFIG = {
5050
fontFamily: win ? 'Consolas' : 'Monaco',
5151
indentType: 'space',
5252
indentSize: '2',
53+
lineWrapping: true,
5354
enableRulers: false,
5455
rulers: [80, 120],
5556
displayLineNumbers: true,

browser/main/modals/PreferencesModal/UiTab.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,17 @@ class UiTab extends React.Component {
546546
</label>
547547
</div>
548548

549+
<div styleName='group-checkBoxSection'>
550+
<label>
551+
<input onChange={(e) => this.handleUIChange(e)}
552+
checked={this.state.config.editor.lineWrapping}
553+
ref='editorLineWrapping'
554+
type='checkbox'
555+
/>&nbsp;
556+
{i18n.__('Wrap line in Snippet Note')}
557+
</label>
558+
</div>
559+
549560
<div styleName='group-checkBoxSection'>
550561
<label>
551562
<input onChange={(e) => this.handleUIChange(e)}

0 commit comments

Comments
 (0)