Fix bug where selections always include an extra character (microsoft#60)

Author: MattIrv

pgsqltoolsservice/workspace/script_file.py

@@ -130,7 +130,7 @@ def get_lines_in_range(self, buffer_range: Range) -> List[str]:
             # If the line we're looking at is not the beginning or end, select entire line,
             # otherwise, trim the unselected part of the line
             start_column: int = buffer_range.start.character if line == buffer_range.start.line else 0
-            end_column: int = buffer_range.end.character + 1 if line == buffer_range.end.line else len(current_line)
+            end_column: int = buffer_range.end.character if line == buffer_range.end.line else len(current_line)
 
             output.append(current_line[start_column:end_column])
         return output

tests/workspace/test_script_file.py

@@ -85,7 +85,7 @@ def test_get_lines_in_range_valid(self):
         result = sf.get_lines_in_range(params)
 
         # Then: I should get a set of lines with the expected result
-        expected_result = ['ef', 'ghij', 'kl']
+        expected_result = ['ef', 'ghij', 'k']
         self.assertEqual(result, expected_result)
 
     def test_get_lines_in_range_invalid_start(self):
@@ -119,7 +119,19 @@ def test_get_text_in_range(self):
         result = sf.get_text_in_range(params)
 
         # Then: I should get a set of lines with the expected result
-        expected_result = os.linesep.join(['ef', 'ghij', 'kl'])
+        expected_result = os.linesep.join(['ef', 'ghij', 'k'])
+        self.assertEqual(result, expected_result)
+
+    def test_get_text_in_range_start_of_line(self):
+        """Test that get_text_in_range works when the cursor is at the start of a line"""
+        sf = self._get_test_script_file()
+
+        # If I get text from a range that covers the entire first line and ends on the second line before any text
+        params = Range.from_data(0, 0, 1, 0)
+        result = sf.get_text_in_range(params)
+
+        # Then I should get the first line and a line with no content as the result
+        expected_result = os.linesep.join(['abc', ''])
         self.assertEqual(result, expected_result)
 
     # VALIDATE POSITION TESTS ##############################################

tests/workspace/test_workspace_service.py

@@ -273,7 +273,7 @@ def test_get_text_selection(self):
         # Retrieve the full text of the file and make sure it matches
         selection_range = Range(Position(1, 1), Position(2, 4))
         result_text = workspace_service.get_text(file_uri, selection_range)
-        self.assertEqual(result_text, os.linesep.join(['ine 2 content', ' line']))
+        self.assertEqual(result_text, os.linesep.join(['ine 2 content', ' lin']))
 
     # IMPLEMENTATION DETAILS ###############################################