revert some code

Author: guanglinn

app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java

@@ -269,24 +269,19 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
 
     @Override
     protected void onFragmentFirstTimeVisible() {
-        _hlEditor.recomputeHighlighting(); // Run before setting scroll position
-        int line = -1;
-        int startPosition = _appSettings.getLastEditPosition(_document.path, 0);
-
         final Bundle args = getArguments();
-        if (args != null) {
-            if (args.containsKey(Document.EXTRA_FILE_LINE_NUMBER)) {
-                line = args.getInt(Document.EXTRA_FILE_LINE_NUMBER);
+        int startPos = _appSettings.getLastEditPosition(_document.path, _hlEditor.length());
+        if (args != null && args.containsKey(Document.EXTRA_FILE_LINE_NUMBER)) {
+            final int lno = args.getInt(Document.EXTRA_FILE_LINE_NUMBER);
+            if (lno >= 0) {
+                startPos = TextViewUtils.getIndexFromLineOffset(_hlEditor.getText(), lno, 0);
+            } else {
+                startPos = _hlEditor.length();
             }
         }
 
-        if (line > -1) {
-            TextViewUtils.getIndexFromLineOffset(_hlEditor.getText(), line, 0);
-            TextViewUtils.setSelectionAndShow(_hlEditor, startPosition);
-        } else {
-            final int scrollY = _appSettings.getLastEditScrollY(_document.path, 0);
-            _verticalScrollView.setScrollY(scrollY);
-        }
+        _hlEditor.recomputeHighlighting(); // Run before setting scroll position
+        TextViewUtils.setSelectionAndShow(_hlEditor, startPos);
 
         // Fade in to hide initial jank
         _hlEditor.post(() -> _hlEditor.animate().alpha(1).setDuration(250).start());

app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java

@@ -341,7 +341,7 @@ public static void showSelection(final TextView text, final int start, final int
         final int startLine = layout.getLineForOffset(lineStart);
         final int startLineTop = layout.getLineTop(startLine);
 
-        final int endLine = layout.getLineForOffset(_end) + 1;
+        final int endLine = layout.getLineForOffset(_end);
         final int endLineBottom = layout.getLineBottom(endLine);
         final int endLineTop = layout.getLineTop(endLine);
         final int lineHeight = endLineBottom - endLineTop;