[[ Bug 16647 ]] Don't under-run the existing mark in wholechunk marking mode

livecodeali · livecodeali · commit de0a83707641 · 2016-01-20T16:46:14.000Z
diff --git a/docs/notes/bugfix-16647.md b/docs/notes/bugfix-16647.md
@@ -0,0 +1 @@
+# Delete only chunk in line should not delete line
diff --git a/engine/src/exec-strings-chunk.cpp b/engine/src/exec-strings-chunk.cpp
@@ -289,7 +289,7 @@ void MCStringsMarkTextChunkInRange(MCExecContext& ctxt, MCStringRef p_string, MC
                     r_end += t_found_range . length;
                 // If we didn't, and this operation does not force additional delimiters, then include the previous delimiter in the mark.
                 // e.g. mark item 3 of a,b,c -> a,b(,c) so that delete item 3 of a,b,c -> a,b
-                else if (r_start > 0 && !r_add)
+                else if (r_start > p_range . offset && !r_add)
                     r_start -= t_found_range . length;
             }
         }
@@ -359,7 +359,7 @@ void MCStringsMarkTextChunkInRange(MCExecContext& ctxt, MCStringRef p_string, MC
             {
 	            if (r_end >= 0 && (uindex_t) r_end < t_length)
                     r_end++;
-                else if (r_start > 0 && !r_add)
+                else if (r_start > p_range . offset && !r_add)
                     r_start--;
             }
         }
@@ -423,7 +423,7 @@ void MCStringsMarkTextChunkInRange(MCExecContext& ctxt, MCStringRef p_string, MC
                 //  and word chunk range goes to the end of the string. 
 	            if (r_end >= 0 && (uindex_t) r_end == t_length)
                 {
-                    while (r_start > 0 && MCUnicodeIsWhitespace(MCStringGetCharAtIndex(p_string, r_start - 1)))
+                    while (r_start > p_range . offset && MCUnicodeIsWhitespace(MCStringGetCharAtIndex(p_string, r_start - 1)))
                         r_start--;
                 }
                 return;
diff --git a/tests/lcs/core/chunks/text.livecodescript b/tests/lcs/core/chunks/text.livecodescript
@@ -0,0 +1,31 @@
+script "CoreChunksText"
+/*
+Copyright (C) 2015 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+on TestDeleteSegmentOfLine
+	local tLines
+	put "a" & return & "b" & return & "c" into tLines
+	delete word 1 of line 2 of tLines
+	TestAssert "delete word of line comprising word does not delete line", the number of lines in tLines is 3
+end TestDeleteSegmentOfLine
+
+on TestDeleteItemOfLine
+	local tLines
+	put "a" & return & "b" & return & "c" into tLines
+	delete item 1 of line 2 of tLines
+	TestAssert "delete item of line comprising item does not delete line", the number of lines in tLines is 3
+end TestDeleteItemOfLine

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Delete only chunk in line should not delete line`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ void MCStringsMarkTextChunkInRange(MCExecContext& ctxt, MCStringRef p_string, MC`
`289`	`289`	`r_end += t_found_range . length;`
`290`	`290`	`// If we didn't, and this operation does not force additional delimiters, then include the previous delimiter in the mark.`
`291`	`291`	`// e.g. mark item 3 of a,b,c -> a,b(,c) so that delete item 3 of a,b,c -> a,b`
`292`		`- else if (r_start > 0 && !r_add)`
	`292`	`+ else if (r_start > p_range . offset && !r_add)`
`293`	`293`	`r_start -= t_found_range . length;`
`294`	`294`	`}`
`295`	`295`	`}`
`@@ -359,7 +359,7 @@ void MCStringsMarkTextChunkInRange(MCExecContext& ctxt, MCStringRef p_string, MC`
`359`	`359`	`{`
`360`	`360`	`if (r_end >= 0 && (uindex_t) r_end < t_length)`
`361`	`361`	`r_end++;`
`362`		`- else if (r_start > 0 && !r_add)`
	`362`	`+ else if (r_start > p_range . offset && !r_add)`
`363`	`363`	`r_start--;`
`364`	`364`	`}`
`365`	`365`	`}`
`@@ -423,7 +423,7 @@ void MCStringsMarkTextChunkInRange(MCExecContext& ctxt, MCStringRef p_string, MC`
`423`	`423`	`// and word chunk range goes to the end of the string.`
`424`	`424`	`if (r_end >= 0 && (uindex_t) r_end == t_length)`
`425`	`425`	`{`
`426`		`- while (r_start > 0 && MCUnicodeIsWhitespace(MCStringGetCharAtIndex(p_string, r_start - 1)))`
	`426`	`+ while (r_start > p_range . offset && MCUnicodeIsWhitespace(MCStringGetCharAtIndex(p_string, r_start - 1)))`
`427`	`427`	`r_start--;`
`428`	`428`	`}`
`429`	`429`	`return;`