GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — included new file diff capability to new unified diff parser · fgsoap/java-diff-utils@94ffdab

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

java-diff-utils/src
- main/java/com/github/difflib/unifieddiff
  - UnifiedDiffWriter.java
- test/java/com/github/difflib/unifieddiff
  - UnifiedDiffWriterTest.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java‎`

Copy file name to clipboardExpand all lines: java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java

+6-3Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import java.io.Writer;`
`21`	`21`	`import java.util.ArrayList;`
`22`	`22`	`import java.util.List;`
	`23`	`+import java.util.Objects;`
`23`	`24`	`import java.util.function.Consumer;`
`24`	`25`	`import java.util.function.Function;`
`25`	`26`	`import java.util.logging.Level;`
`@@ -34,6 +35,7 @@ public class UnifiedDiffWriter {`
`34`	`35`	`private static final Logger LOG = Logger.getLogger(UnifiedDiffWriter.class.getName());`
`35`	`36`
`36`	`37`	`public static void write(UnifiedDiff diff, Function<String, List<String>> originalLinesProvider, Writer writer, int contextSize) throws IOException {`
	`38`	`+ Objects.requireNonNull(originalLinesProvider, "original lines provider needs to be specified");`
`37`	`39`	`write(diff, originalLinesProvider, line -> {`
`38`	`40`	`try {`
`39`	`41`	`writer.append(line).append("\n");`
`@@ -138,7 +140,8 @@ private static void processDeltas(Consumer<String> writer,`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`// output the context before the first Delta`
`141`		`- for (line = contextStart; line < curDelta.getSource().getPosition(); line++) { //`
	`143`	`+ for (line = contextStart; line < curDelta.getSource().getPosition()`
	`144`	`+ && line < origLines.size(); line++) { //`
`142`	`145`	`buffer.add(" " + origLines.get(line));`
`143`	`146`	`origTotal++;`
`144`	`147`	`revTotal++;`
`@@ -153,8 +156,8 @@ private static void processDeltas(Consumer<String> writer,`
`153`	`156`	`AbstractDelta<String> nextDelta = deltas.get(deltaIndex);`
`154`	`157`	`int intermediateStart = curDelta.getSource().getPosition()`
`155`	`158`	`+ curDelta.getSource().getLines().size();`
`156`		`- for (line = intermediateStart; line < nextDelta.getSource()`
`157`		`- .getPosition(); line++) {`
	`159`	`+ for (line = intermediateStart; line < nextDelta.getSource().getPosition()`
	`160`	`+ && line < origLines.size(); line++) {`
`158`	`161`	`// output the code between the last Delta and this one`
`159`	`162`	`buffer.add(" " + origLines.get(line));`
`160`	`163`	`origTotal++;`

Collapse file

`‎java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java‎`

Copy file name to clipboardExpand all lines: java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java

+2-3Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@`
`27`	`27`	`import java.nio.file.Files;`
`28`	`28`	`import java.nio.file.Paths;`
`29`	`29`	`import java.util.ArrayList;`
	`30`	`+import java.util.Collections;`
`30`	`31`	`import java.util.List;`
`31`	`32`	`import static org.junit.Assert.assertEquals;`
`32`		`-import org.junit.Ignore;`
`33`	`33`	`import org.junit.Test;`
`34`	`34`
`35`	`35`	`/**`
`@@ -42,13 +42,12 @@ public UnifiedDiffWriterTest() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Test`
`45`		`- @Ignore`
`46`	`45`	`public void testWrite() throws URISyntaxException, IOException {`
`47`	`46`	`String str = readFile(UnifiedDiffReaderTest.class.getResource("jsqlparser_patch_1.diff").toURI(), Charset.defaultCharset());`
`48`	`47`	`UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(new ByteArrayInputStream(str.getBytes()));`
`49`	`48`
`50`	`49`	`StringWriter writer = new StringWriter();`
`51`		`- UnifiedDiffWriter.write(diff, f -> null, writer, 5);`
	`50`	`+ UnifiedDiffWriter.write(diff, f -> Collections.EMPTY_LIST, writer, 5);`
`52`	`51`	`System.out.println(writer.toString());`
`53`	`52`	`}`
`54`	`53`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.