refactoring

This commit is contained in:
Philipp Kühn
2020-04-12 23:42:51 +02:00
parent 83ce601621
commit 56beb707ab
3 changed files with 34 additions and 127 deletions

View File

@@ -48,11 +48,10 @@ export default class Bold extends Mark {
} }
inputRules() { inputRules() {
return ['**', '__'].map(character => ([ return ['**', '__'].map(character => {
// match start of line return markInputRule(
markInputRule(
VerEx() VerEx()
.startOfLine() .add('(?:^|\\s)')
.beginCapture() .beginCapture()
.find(character) .find(character)
.beginCapture() .beginCapture()
@@ -62,31 +61,15 @@ export default class Bold extends Mark {
.endCapture() .endCapture()
.endOfLine(), .endOfLine(),
this.type, this.type,
), )
// match before whitespace })
markInputRule(
VerEx()
.whitespace()
.beginCapture()
.find(character)
.beginCapture()
.somethingBut(character)
.endCapture()
.find(character)
.endCapture()
.endOfLine(),
this.type,
),
]))
.flat(1)
} }
pasteRules() { pasteRules() {
return ['**', '__'].map(character => ([ return ['**', '__'].map(character => {
// match start of line return markPasteRule(
markPasteRule(
VerEx() VerEx()
.startOfLine() .add('(?:^|\\s)')
.beginCapture() .beginCapture()
.find(character) .find(character)
.beginCapture() .beginCapture()
@@ -95,22 +78,8 @@ export default class Bold extends Mark {
.find(character) .find(character)
.endCapture(), .endCapture(),
this.type, this.type,
), )
// match before whitespace })
markPasteRule(
VerEx()
.whitespace()
.beginCapture()
.find(character)
.beginCapture()
.somethingBut(character)
.endCapture()
.find(character)
.endCapture(),
this.type,
),
]))
.flat(1)
} }
} }

View File

@@ -39,69 +39,38 @@ export default class Code extends Mark {
} }
inputRules() { inputRules() {
return ['`'].map(character => ([ return [
// match start of line
markInputRule( markInputRule(
VerEx() VerEx()
.startOfLine() .add('(?:^|\\s)')
.beginCapture() .beginCapture()
.find(character) .find('`')
.beginCapture() .beginCapture()
.somethingBut(character) .somethingBut('`')
.endCapture() .endCapture()
.find(character) .find('`')
.endCapture() .endCapture()
.endOfLine(), .endOfLine(),
this.type, this.type,
), )
// match before whitespace ]
markInputRule(
VerEx()
.whitespace()
.beginCapture()
.find(character)
.beginCapture()
.somethingBut(character)
.endCapture()
.find(character)
.endCapture()
.endOfLine(),
this.type,
),
]))
.flat(1)
} }
pasteRules() { pasteRules() {
return ['`'].map(character => ([ return [
// match start of line
markPasteRule( markPasteRule(
VerEx() VerEx()
.startOfLine() .add('(?:^|\\s)')
.beginCapture() .beginCapture()
.find(character) .find('`')
.beginCapture() .beginCapture()
.somethingBut(character) .somethingBut('`')
.endCapture() .endCapture()
.find(character) .find('`')
.endCapture(), .endCapture(),
this.type, this.type,
), )
// match before whitespace ]
markPasteRule(
VerEx()
.whitespace()
.beginCapture()
.find(character)
.beginCapture()
.somethingBut(character)
.endCapture()
.find(character)
.endCapture(),
this.type,
),
]))
.flat(1)
} }
} }

View File

@@ -40,11 +40,10 @@ export default class Italic extends Mark {
} }
inputRules() { inputRules() {
return ['*', '_'].map(character => ([ return ['*', '_'].map(character => {
// match start of line return markInputRule(
markInputRule(
VerEx() VerEx()
.startOfLine() .add('(?:^|\\s)')
.beginCapture() .beginCapture()
.find(character) .find(character)
.beginCapture() .beginCapture()
@@ -54,31 +53,15 @@ export default class Italic extends Mark {
.endCapture() .endCapture()
.endOfLine(), .endOfLine(),
this.type, this.type,
), )
// match before whitespace })
markInputRule(
VerEx()
.whitespace()
.beginCapture()
.find(character)
.beginCapture()
.somethingBut(character)
.endCapture()
.find(character)
.endCapture()
.endOfLine(),
this.type,
),
]))
.flat(1)
} }
pasteRules() { pasteRules() {
return ['*', '_'].map(character => ([ return ['*', '_'].map(character => {
// match start of line return markPasteRule(
markPasteRule(
VerEx() VerEx()
.startOfLine() .add('(?:^|\\s)')
.beginCapture() .beginCapture()
.find(character) .find(character)
.beginCapture() .beginCapture()
@@ -87,22 +70,8 @@ export default class Italic extends Mark {
.find(character) .find(character)
.endCapture(), .endCapture(),
this.type, this.type,
), )
// match before whitespace })
markPasteRule(
VerEx()
.whitespace()
.beginCapture()
.find(character)
.beginCapture()
.somethingBut(character)
.endCapture()
.find(character)
.endCapture(),
this.type,
),
]))
.flat(1)
} }
} }