Refactorings

Author: elifarley

pyproject.toml

@@ -47,14 +47,15 @@ dev = [
 
 [tool.setuptools]
 package-dir = {"" = "src"}
-py-modules = ["cedarscript_editor"]
+py-modules = ["cedarscript_editor", "text_manipulaiton"]
 
 [tool.setuptools.dynamic]
 version = {attr = "cedarscript_editor.__version__"}
 
 [tool.setuptools.packages.find]
 where = ["src"]
-include = ["cedarscript_editor*", "text_editor*", "identifier_selector*", "*identifier_finder*"]
+include = ["cedarscript_editor*", "text_editor*", "identifier_selector*", "*identifier_finder*",
+"indentation_*", "range_*"]
 namespaces = false
 
 [tool.setuptools.package-data]

src/cedarscript_editor/cedarscript_editor.py

@@ -7,9 +7,9 @@
     InsertClause, ReplaceClause, EditingAction, BodyOrWhole, RegionClause, MarkerType
 from cedarscript_ast_parser.cedarscript_ast_parser import MarkerCompatible, RelativeMarker, \
     RelativePositionType
-from cedarscript_editor.indentation_kit import IndentationInfo
-from cedarscript_editor.range_spec import IdentifierBoundaries, RangeSpec
-from cedarscript_editor.text_editor_kit import read_file, write_file, bow_to_search_range
+from text_manipulation.indentation_kit import IndentationInfo
+from text_manipulation.range_spec import IdentifierBoundaries, RangeSpec
+from text_manipulation.text_editor_kit import read_file, write_file, bow_to_search_range
 
 from .identifier_selector import select_finder
 

src/cedarscript_editor/identifier_selector.py

@@ -5,7 +5,7 @@
 import logging
 
 from cedarscript_editor.python_identifier_finder import find_python_identifier
-from cedarscript_editor.range_spec import IdentifierBoundaries
+from text_manipulation.range_spec import IdentifierBoundaries
 
 _log = logging.getLogger(__name__)
 

src/cedarscript_editor/python_identifier_finder.py

@@ -3,8 +3,8 @@
 from rope.base import ast, libutils
 from collections.abc import Sequence
 
-from cedarscript_editor.range_spec import IdentifierBoundaries, RangeSpec
-from cedarscript_editor.indentation_kit import get_line_indent_count
+from text_manipulation.range_spec import IdentifierBoundaries, RangeSpec
+from text_manipulation.indentation_kit import get_line_indent_count
 
 
 def get_by_offset(obj: Sequence, offset: int):

src/text_manipulation/__init__.py

@@ -3,7 +3,7 @@
 from typing import NamedTuple
 
 from cedarscript_ast_parser import Marker, RelativeMarker, RelativePositionType, MarkerType, BodyOrWhole
-from cedarscript_editor.indentation_kit import get_line_indent_count
+from text_manipulation.indentation_kit import get_line_indent_count
 
 MATCH_TYPES = ('exact', 'stripped', 'normalized', 'partial')
 

src/cedarscript_editor/indentation_kit.py renamed to src/text_manipulation/indentation_kit.py

@@ -2,7 +2,7 @@
 from typing import Protocol, runtime_checkable
 
 from cedarscript_ast_parser import Marker, RelativeMarker, RelativePositionType, Segment, MarkerType, BodyOrWhole
-from cedarscript_editor.range_spec import IdentifierBoundaries, RangeSpec
+from text_manipulation.range_spec import IdentifierBoundaries, RangeSpec
 
 
 def read_file(file_path: str) -> str: