Closes #157

sylvainhalle · Mar 31, 2021 · 1096519 · 1096519
1 parent a61c04f
commit 1096519
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 5 deletions.
diff --git a/Source/Core/src/ca/uqac/lif/textidote/Main.java b/Source/Core/src/ca/uqac/lif/textidote/Main.java
@@ -1,6 +1,6 @@
 /*
     TeXtidote, a linter for LaTeX documents
-    Copyright (C) 2018  Sylvain Hallé
+    Copyright (C) 2018-2021  Sylvain Hallé
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/Source/Core/src/ca/uqac/lif/textidote/as/AnnotatedString.java b/Source/Core/src/ca/uqac/lif/textidote/as/AnnotatedString.java
@@ -1,6 +1,6 @@
 /*
     TeXtidote, a linter for LaTeX documents
-    Copyright (C) 2018  Sylvain Hallé
+    Copyright (C) 2018-2021  Sylvain Hallé
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -72,6 +72,11 @@ public class AnnotatedString
 	 * The size (in bytes) of the OS-dependent line separator
 	 */
 	public static final transient int CRLF_SIZE = System.getProperty("line.separator").length();
+
+	/**
+	 * The OS-dependent line separator, expressed as a regular expression
+	 */
+	public static final transient String CRLF_REGEX = getCrlfRegex(CRLF);
 
 	/**
 	 * Creates a new empty annotated string
@@ -908,4 +913,22 @@ public int getOffset(Position p)
 		}
 		return -1;
 	}
+
+	/**
+	 * Turns the OS-dependent CRLF character into a regular expression. 
+	 * @param s The character
+	 * @return The regex
+	 */
+	protected static String getCrlfRegex(String s)
+	{
+		if (s.compareTo("\\r\\n") == 0)
+		{
+			return ("\\\\r\\\\n");
+		}
+		if (s.compareTo("\\r") == 0)
+		{
+			return ("\\\\r");
+		}
+		return ("\\\\n");
+	}
 }
diff --git a/Source/Core/src/ca/uqac/lif/textidote/cleaning/ReplacementCleaner.java b/Source/Core/src/ca/uqac/lif/textidote/cleaning/ReplacementCleaner.java
@@ -1,6 +1,6 @@
 /*
     TeXtidote, a linter for LaTeX documents
-    Copyright (C) 2018-2019  Sylvain Hallé
+    Copyright (C) 2018-2021  Sylvain Hallé
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/Source/Core/src/ca/uqac/lif/textidote/cleaning/markdown/MarkdownCleaner.java b/Source/Core/src/ca/uqac/lif/textidote/cleaning/markdown/MarkdownCleaner.java
@@ -1,6 +1,6 @@
 /*
     TeXtidote, a linter for LaTeX documents
-    Copyright (C) 2018-2019  Sylvain Hallé
+    Copyright (C) 2018-2021  Sylvain Hallé
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -122,6 +122,7 @@ public class MarkdownCleaner extends TextCleaner
 		as_out = as_out.replaceAll("`.*?`", "X");
 		as_out = as_out.replaceAll("!\\[(.*?)\\]\\(.*?\\)", "$1"); // images
 		as_out = as_out.replaceAll("\\[(.*?)\\]\\(.*?\\)", "$1"); // links
+		as_out = as_out.replaceAll("^    .*$", ""); // indented code blocks
 		as_out = as_out.replaceAll("^\\s*?- ", "• ");
 		as_out = as_out.replaceAll("^\\s*#*\\s*", "");
 		as_out = as_out.replaceAll("^\\s*=*\\s*$", "");

diff --git a/Source/CoreTest/src/ca/uqac/lif/textidote/cleaning/MarkdownCleanerTest.java b/Source/CoreTest/src/ca/uqac/lif/textidote/cleaning/MarkdownCleanerTest.java
@@ -44,4 +44,12 @@ public void testRemoveBackticks1() throws TextCleanerException
 		AnnotatedString as = detexer.clean(AnnotatedString.read(new Scanner("This is `foo`.")));
 		assertEquals("This is X.", as.toString());
 	}
+
+	@Test
+	public void testRemoveIndentedBlocks1() throws TextCleanerException
+	{
+		MarkdownCleaner detexer = new MarkdownCleaner();
+		AnnotatedString as = detexer.clean(AnnotatedString.read(new Scanner("Here are a few words." + CRLF + CRLF + "    Some code block" + CRLF + CRLF + "Here are some more.")));
+		assertEquals("Here are a few words." + CRLF + CRLF + CRLF + CRLF + "Here are some more.", as.toString());
+	}
 }
diff --git a/Source/CoreTest/src/ca/uqac/lif/textidote/rules/CheckRegexTest.java b/Source/CoreTest/src/ca/uqac/lif/textidote/rules/CheckRegexTest.java
@@ -1,6 +1,6 @@
 /*
     TeXtidote, a linter for LaTeX documents
-    Copyright (C) 2018  Sylvain Hallé
+    Copyright (C) 2018-2021  Sylvain Hallé
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by