Added automatic tests and fixes for all of those tests #8

alextretyak · 2016-12-01T12:16:33Z

No description provided.

alextretyak · 2016-12-03T08:12:54Z

I have implemented “Paste from History” feature (as I decided little earlier).
[And as I see this change (7b5920d) unintentionally fell into this pull request.]

…xt on Windows (bug was observed while pasting multi-line text [copied from Sublime Text] into Windows Notepad)

Traceback (most recent call last): File "...\SublimeText\sublime_plugin.py", line 818, in run_ return self.run(edit) File "...\SublimeText\Data\Packages\CopyEdit\copy_edit.py", line 68, in run if pasteboard != '\n'.join([s[0] for s in selection_strings]): TypeError: sequence item 0: expected str instance, NoneType found

…ing selected text by pressing Delete or Backspace

This restores the original sublime text behaviour of copy and pasting without selection. Example: Caret=| Copy Paste aaaa aaaa bb|bb bbbb cccc bb|bb cccc Without this patch the carets return on paste to the front of the line

…e, so "append" is used instead

adzenith

A long-overdue review! I appreciate the contributions!

adzenith · 2018-08-17T23:02:24Z

Default (Windows).sublime-keymap

@@ -0,0 +1,3 @@
+[
+	{ "keys": ["ctrl+shift+v"], "command": "paste_from_history_edit" }


I don't know if we should bind keys by default - what do you think? Maybe we should let people bind their own keys?

People can always rebind keys how they like, but I consider that this [paste from history] operation is more needed than paste_and_indent which is assigned by default in SublimeText at ctrl+shift+v.
Besides paste_and_indent is somewhat broken and can not be reliably used, for example:
If you have code like this:

if nesting_level == 0: break

and put cursor after last line with break, then command past_and_indent align new_code wrong:

if nesting_level == 0: break new_code

Another example:
If you have

if nesting_level == 0: # comment break

then cut line with break:

if nesting_level == 0: # comment

and immediately execute past_and_indent command:

if nesting_level == 0: # comment break

So, I would rather go with regular paste command and realign all code manually.

adzenith · 2018-08-17T23:07:49Z

copy_edit.py


-		str_index = 0
 		new_sels = []
-		for sel in self.view.sel():


What if it was just for sel in reversed(self.view.sel()):? Would that fix it? That way you're replacing from the end. Or maybe I'm misunderstanding the bug?

Please specify which commit your question is related to.

Ok, I've found the related commit, but I can not think of how it can be reimplemented (simple adding reversed is not enough because of str_index usage inside that loop).
You can play with the code yourself if you wish, but do not forget to run tests (your suggestion breaks test (1)).

adzenith · 2018-08-17T23:08:24Z

copy_edit.py

    def on_text_command(self, view, command_name, args):
        if command_name in ["cut", "copy", "paste", "paste_from_history"]: # actually adding "paste_from_history" here does not make any sense because this command is disabled after startup of SublimeText
            return (command_name + "_edit", args)
+        if command_name in ["left_delete", "right_delete"]:


This will trigger for every character you delete, won't it?

Yes it is.
I can't remember why I've done this this way, but as I can see performance impact is negligible, so I do not see the problems with this approach.

adzenith · 2018-08-17T23:08:43Z

cut_copy_paste_tests.py

        def skip_comments():
            nonlocal pos
-            while tests[pos] == '[':
+            while tests[pos] == '[': # [


What are these comments for?

To balance opening and closing brackets.

adzenith · 2018-08-17T23:12:38Z

copy_edit.py

 				new_sel_strings.append((self.view.substr(s), False))
 			elif copy_with_empty_sel:
-				new_sel_strings.append((self.view.substr(self.view.full_line(s)), True))
+				new_sel_strings.append((self.view.substr(self.view.line(s)) + "\n", True))


What bug does this fix? Why would you want to manually add a newline?

It fixes case when selection is empty and when caret is placed at the last line of file and when there is no newline at end of file. Do you use copy with empty selection? If not, then you wouldn't understand this fix.

adzenith · 2018-08-17T23:13:22Z

copy_edit.py

 			return

+		if numsels == 1: # To fix TN 7
+			selection_strings = [(("" if selection_strings[0][1] else "\n") # проверка нужна, так как если selection_strings[0][1] == True, то \n уже есть в конце строки


Any chance you could translate this? I'm not positive what this is fixing.

Ok, I have added commit with translation of this comment.
About "what this is fixing" please see test, which was added in this commit (if you wish I can explain what it means, but it's obvious [DA >‘1’<2 means insert text 12 and select 1]).

adzenith · 2018-08-17T23:14:20Z

cut_copy_paste_tests.py

-            for command in commands:
-                cmd = re.sub(R' \[[^]]+]', '', command[1]) # remove comments
+            buffer.run_command("append", { "characters": "".join([c[0] + '. ' + c[1] + "\n" for c in commands]) } ) # || "insert" is not working totally correctly here, so "append" is used instead
+                                                                                                                    # \\ To see what is the difference try


Can you put these comments on their own lines instead of at the end of other lines?

I don't totally understand you (do you mean place all 5 comment lines before buffer.run_command("append", ... or something else), but you can move this comments how you like. [Personally I see no problem with this comments because wide monitors is so widespread nowadays.]

adzenith · 2018-08-17T23:14:55Z

copy_edit.py

 			string = next(sel_strings)
 			for sel in self.view.sel():
-				replace_region = sublime.Region(self.view.line(sel.begin()).begin()) if string[1] else sel
+				replace_region = sublime.Region(self.view.line(sel.begin()).begin()) if string[1] and sel.size() == 0 else sel


What does this fix?

Obviously, it fixes test TN 8, as commit message says. :-)

TN 8 DA‘1>‘’< 2’ CO copy DA‘>‘1 ’<2’ CO paste CR‘1 >‘’<2’

If you still don't get it [i.e. how to read this tests' notation], here is the explanation:

DA‘1>‘’< 2’

means initialize DAta (or DAno in Russian) with:

1| 2

(here | means cursor/caret)

CO copy means run COmmand copy (like view.run_command("copy")).

DA‘>‘1 ’<2’

means replace DAta with:

|>1 <|2

(here |> means selection start, and <| means selection end)

CO paste means run COmmand paste (like view.run_command("paste")).

And at last

CR‘1 >‘’<2’

means that Correct Result is should be the following:

1 |2

Before this commit the result was this:

1 1 |2

…nd remove one wrong/strange[/unnecessary] comment

alextretyak added 3 commits December 1, 2016 13:31

Add support of standard main menu commands (Edit:Cut/Copy/Paste)

43b57ba

Add cut_copy_paste_tests.py

982e8c6

Fix test #(4) and [this issue](sublimehq/sublime_text#1461)

b9e74b8

alextretyak mentioned this pull request Dec 1, 2016

Option to change behavior of pasting into multiple selections sublimehq/sublime_text#1435

Open

1 task

alextretyak changed the title ~~Added automatic tests and fixed for all of those tests~~ Added automatic tests and fixes for all of those tests Dec 1, 2016

alextretyak added 3 commits December 3, 2016 11:42

Fix tests #(6) and #(7)

98746fe

Fix tests #(8) and #(9)

7673f1e

Fix test #(4a)

3cbe634

alextretyak force-pushed the master branch from b6f6eaf to b9e74b8 Compare December 3, 2016 02:10

Add paste_from_history_edit command

7b5920d

alextretyak and others added 12 commits December 6, 2016 22:01

Fix incorrect line endings when copying multi-line text in Sublime Te…

3283bcb

…xt on Windows (bug was observed while pasting multi-line text [copied from Sublime Text] into Windows Notepad)

Fix test #(10)

55d7187

Make "backup" copy of selection in the paste-history-list after delet…

a7bc3d4

…ing selected text by pressing Delete or Backspace

Add tests_neo for testing much more accurately

11a1fb6

Fix test TN 2

276f8a7

Fix caret position

e07420b

This restores the original sublime text behaviour of copy and pasting without selection. Example: Caret=| Copy Paste aaaa aaaa bb|bb bbbb cccc bb|bb cccc Without this patch the carets return on paste to the front of the line

Add TN 5 (in accordance with Eyenseo's fix)

9061b99

Fix single line case

4b3c2e0

Add&fix TN 7

a6b24bc

Comment extension for # "insert" is not working totally correctly her…

7701989

…e, so "append" is used instead

Add&fix TN 8

a2c5bae

adzenith reviewed Aug 17, 2018

View reviewed changes

Translate comment upon ‘request of adzenith’[adzenith#8 (comment)], a…

87b0adc

…nd remove one wrong/strange[/unnecessary] comment

		@@ -0,0 +1,3 @@
		[
		{ "keys": ["ctrl+shift+v"], "command": "paste_from_history_edit" }

Added automatic tests and fixes for all of those tests #8

Are you sure you want to change the base?

Added automatic tests and fixes for all of those tests #8

Uh oh!

Conversation

alextretyak commented Dec 1, 2016

Uh oh!

alextretyak commented Dec 3, 2016

Uh oh!

adzenith left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alextretyak Aug 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alextretyak Aug 19, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

alextretyak Aug 18, 2018 •

edited

Loading

alextretyak Aug 19, 2018 •

edited

Loading