From 42aab2280e5bddd1d2e5d96d201fc3ec95b1bc91 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Sun, 2 Dec 2018 14:04:58 +0300 Subject: [PATCH] Rename blockQuoteIndent to blockIndent --- .../noties/markwon/ext/tasklist/TaskListPlugin.java | 12 ++++++------ .../main/java/ru/noties/markwon/MarkwonVisitor.java | 8 ++++---- .../java/ru/noties/markwon/MarkwonVisitorImpl.java | 10 +++++----- .../main/java/ru/noties/markwon/core/CorePlugin.java | 10 +++++----- .../markwon/core/visitor/BlockQuoteNodeVisitor.java | 4 ++++ .../markwon/core/visitor/EmphasisNodeVisitor.java | 4 ++++ .../core/visitor/StrongEmphasisNodeVisitor.java | 4 ++++ .../noties/markwon/core/visitor/TextNodeVisitor.java | 4 ++++ 8 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 markwon/src/main/java/ru/noties/markwon/core/visitor/BlockQuoteNodeVisitor.java create mode 100644 markwon/src/main/java/ru/noties/markwon/core/visitor/EmphasisNodeVisitor.java create mode 100644 markwon/src/main/java/ru/noties/markwon/core/visitor/StrongEmphasisNodeVisitor.java create mode 100644 markwon/src/main/java/ru/noties/markwon/core/visitor/TextNodeVisitor.java diff --git a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java index dc81b8f3..4efe4892 100644 --- a/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java +++ b/markwon-ext-tasklist/src/main/java/ru/noties/markwon/ext/tasklist/TaskListPlugin.java @@ -70,9 +70,9 @@ public class TaskListPlugin extends AbstractMarkwonPlugin { visitor.ensureNewLine(); - visitor.incrementBlockQuoteIndent(); + visitor.incrementBlockIndent(); visitor.visitChildren(taskListBlock); - visitor.decrementBlockQuoteIndent(); + visitor.decrementBlockIndent(); if (visitor.hasNext(taskListBlock)) { visitor.ensureNewLine(); @@ -86,20 +86,20 @@ public class TaskListPlugin extends AbstractMarkwonPlugin { final int length = visitor.length(); - final int indent = visitor.blockQuoteIndent(); - visitor.blockQuoteIntent(indent + taskListItem.indent()); + final int indent = visitor.blockIndent(); + visitor.blockIntent(indent + taskListItem.indent()); visitor.visitChildren(taskListItem); visitor.setSpans(length, new TaskListSpan( visitor.theme(), drawable, - visitor.blockQuoteIndent(), + visitor.blockIndent(), taskListItem.done())); if (visitor.hasNext(taskListItem)) { visitor.ensureNewLine(); } - visitor.blockQuoteIntent(indent); + visitor.blockIntent(indent); } }); } diff --git a/markwon/src/main/java/ru/noties/markwon/MarkwonVisitor.java b/markwon/src/main/java/ru/noties/markwon/MarkwonVisitor.java index 5bb22998..40d389b4 100644 --- a/markwon/src/main/java/ru/noties/markwon/MarkwonVisitor.java +++ b/markwon/src/main/java/ru/noties/markwon/MarkwonVisitor.java @@ -39,13 +39,13 @@ public interface MarkwonVisitor extends Visitor { boolean hasNext(@NonNull Node node); - void incrementBlockQuoteIndent(); + void incrementBlockIndent(); - void decrementBlockQuoteIndent(); + void decrementBlockIndent(); - void blockQuoteIntent(int blockQuoteIndent); + void blockIntent(int blockIndent); - int blockQuoteIndent(); + int blockIndent(); void incrementListLevel(); diff --git a/markwon/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java b/markwon/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java index 07684737..94399509 100644 --- a/markwon/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java +++ b/markwon/src/main/java/ru/noties/markwon/MarkwonVisitorImpl.java @@ -217,22 +217,22 @@ class MarkwonVisitorImpl implements MarkwonVisitor { } @Override - public void incrementBlockQuoteIndent() { + public void incrementBlockIndent() { blockQuoteIndent += 1; } @Override - public void decrementBlockQuoteIndent() { + public void decrementBlockIndent() { blockQuoteIndent -= 1; } @Override - public void blockQuoteIntent(int blockQuoteIndent) { - this.blockQuoteIndent = blockQuoteIndent; + public void blockIntent(int blockIndent) { + this.blockQuoteIndent = blockIndent; } @Override - public int blockQuoteIndent() { + public int blockIndent() { return blockQuoteIndent; } diff --git a/markwon/src/main/java/ru/noties/markwon/core/CorePlugin.java b/markwon/src/main/java/ru/noties/markwon/core/CorePlugin.java index 929391b9..01c35d37 100644 --- a/markwon/src/main/java/ru/noties/markwon/core/CorePlugin.java +++ b/markwon/src/main/java/ru/noties/markwon/core/CorePlugin.java @@ -126,10 +126,10 @@ public class CorePlugin extends AbstractMarkwonPlugin { visitor.ensureNewLine(); final int length = visitor.length(); - visitor.incrementBlockQuoteIndent(); + visitor.incrementBlockIndent(); visitor.visitChildren(blockQuote); visitor.setSpans(length, visitor.factory().blockQuote(visitor.theme())); - visitor.decrementBlockQuoteIndent(); + visitor.decrementBlockIndent(); if (visitor.hasNext(blockQuote)) { visitor.ensureNewLine(); @@ -229,7 +229,7 @@ public class CorePlugin extends AbstractMarkwonPlugin { if (visitor.hasNext(node)) { visitor.ensureNewLine(); if (visitor.listLevel() == 0 - && visitor.blockQuoteIndent() == 0) { + && visitor.blockIndent() == 0) { visitor.forceNewLine(); } } @@ -242,7 +242,7 @@ public class CorePlugin extends AbstractMarkwonPlugin { final int length = visitor.length(); - visitor.incrementBlockQuoteIndent(); + visitor.incrementBlockIndent(); visitor.incrementListLevel(); final Node parent = listItem.getParent(); @@ -265,7 +265,7 @@ public class CorePlugin extends AbstractMarkwonPlugin { } - visitor.decrementBlockQuoteIndent(); + visitor.decrementBlockIndent(); visitor.decrementListLevel(); if (visitor.hasNext(listItem)) { diff --git a/markwon/src/main/java/ru/noties/markwon/core/visitor/BlockQuoteNodeVisitor.java b/markwon/src/main/java/ru/noties/markwon/core/visitor/BlockQuoteNodeVisitor.java new file mode 100644 index 00000000..46ad855e --- /dev/null +++ b/markwon/src/main/java/ru/noties/markwon/core/visitor/BlockQuoteNodeVisitor.java @@ -0,0 +1,4 @@ +package ru.noties.markwon.core.visitor; + +public class BlockQuoteNodeVisitor { +} diff --git a/markwon/src/main/java/ru/noties/markwon/core/visitor/EmphasisNodeVisitor.java b/markwon/src/main/java/ru/noties/markwon/core/visitor/EmphasisNodeVisitor.java new file mode 100644 index 00000000..bfc5847e --- /dev/null +++ b/markwon/src/main/java/ru/noties/markwon/core/visitor/EmphasisNodeVisitor.java @@ -0,0 +1,4 @@ +package ru.noties.markwon.core.visitor; + +public class EmphasisNodeVisitor { +} diff --git a/markwon/src/main/java/ru/noties/markwon/core/visitor/StrongEmphasisNodeVisitor.java b/markwon/src/main/java/ru/noties/markwon/core/visitor/StrongEmphasisNodeVisitor.java new file mode 100644 index 00000000..64176e0c --- /dev/null +++ b/markwon/src/main/java/ru/noties/markwon/core/visitor/StrongEmphasisNodeVisitor.java @@ -0,0 +1,4 @@ +package ru.noties.markwon.core.visitor; + +public class StrongEmphasisNodeVisitor { +} diff --git a/markwon/src/main/java/ru/noties/markwon/core/visitor/TextNodeVisitor.java b/markwon/src/main/java/ru/noties/markwon/core/visitor/TextNodeVisitor.java new file mode 100644 index 00000000..8f553ace --- /dev/null +++ b/markwon/src/main/java/ru/noties/markwon/core/visitor/TextNodeVisitor.java @@ -0,0 +1,4 @@ +package ru.noties.markwon.core.visitor; + +public class TextNodeVisitor { +}