Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
12131230
Commit
12131230
authored
Aug 04, 2019
by
Terry Jan Reedy
Committed by
GitHub
Aug 04, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-36419: IDLE - Refactor autocompete and improve testing. (#15121)
parent
d748a808
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
217 additions
and
177 deletions
+217
-177
Lib/idlelib/autocomplete.py
Lib/idlelib/autocomplete.py
+49
-64
Lib/idlelib/autocomplete_w.py
Lib/idlelib/autocomplete_w.py
+18
-14
Lib/idlelib/idle_test/test_autocomplete.py
Lib/idlelib/idle_test/test_autocomplete.py
+149
-99
Misc/NEWS.d/next/IDLE/2019-08-04-17-10-01.bpo-36419.TJZqOc.rst
...NEWS.d/next/IDLE/2019-08-04-17-10-01.bpo-36419.TJZqOc.rst
+1
-0
No files found.
Lib/idlelib/autocomplete.py
View file @
12131230
...
...
@@ -8,42 +8,45 @@ import os
import
string
import
sys
# These constants represent the two different types of completions.
# They must be defined here so autocomple_w can import them.
COMPLETE_ATTRIBUTES
,
COMPLETE_FILES
=
range
(
1
,
2
+
1
)
# Two types of completions; defined here for autocomplete_w import below.
ATTRS
,
FILES
=
0
,
1
from
idlelib
import
autocomplete_w
from
idlelib.config
import
idleConf
from
idlelib.hyperparser
import
HyperParser
# Tuples passed to open_completions.
# EvalFunc, Complete, WantWin, Mode
FORCE
=
True
,
False
,
True
,
None
# Control-Space.
TAB
=
False
,
True
,
True
,
None
# Tab.
TRY_A
=
False
,
False
,
False
,
ATTRS
# '.' for attributes.
TRY_F
=
False
,
False
,
False
,
FILES
# '/' in quotes for file name.
# This string includes all chars that may be in an identifier.
# TODO Update this here and elsewhere.
ID_CHARS
=
string
.
ascii_letters
+
string
.
digits
+
"_"
SEPS
=
os
.
sep
if
os
.
altsep
:
# e.g. '/' on Windows...
SEPS
+=
os
.
altsep
SEPS
=
f"
{
os
.
sep
}{
os
.
altsep
if
os
.
altsep
else
''
}
"
TRIGGERS
=
f".
{
SEPS
}
"
class
AutoComplete
:
def
__init__
(
self
,
editwin
=
None
):
self
.
editwin
=
editwin
if
editwin
is
not
None
:
# not in subprocess or test
if
editwin
is
not
None
:
# not in subprocess or
no-gui
test
self
.
text
=
editwin
.
text
self
.
autocompletewindow
=
None
# id of delayed call, and the index of the text insert when
# the delayed call was issued. If _delayed_completion_id is
# None, there is no delayed call.
self
.
_delayed_completion_id
=
None
self
.
_delayed_completion_index
=
None
self
.
autocompletewindow
=
None
# id of delayed call, and the index of the text insert when
# the delayed call was issued. If _delayed_completion_id is
# None, there is no delayed call.
self
.
_delayed_completion_id
=
None
self
.
_delayed_completion_index
=
None
@
classmethod
def
reload
(
cls
):
cls
.
popupwait
=
idleConf
.
GetOption
(
"extensions"
,
"AutoComplete"
,
"popupwait"
,
type
=
"int"
,
default
=
0
)
def
_make_autocomplete_window
(
self
):
def
_make_autocomplete_window
(
self
):
# Makes mocking easier.
return
autocomplete_w
.
AutoCompleteWindow
(
self
.
text
)
def
_remove_autocomplete_window
(
self
,
event
=
None
):
...
...
@@ -52,30 +55,12 @@ class AutoComplete:
self
.
autocompletewindow
=
None
def
force_open_completions_event
(
self
,
event
):
"""Happens when the user really wants to open a completion list, even
if a function call is needed.
"""
self
.
open_completions
(
True
,
False
,
True
)
"(^space) Open completion list, even if a function call is needed."
self
.
open_completions
(
FORCE
)
return
"break"
def
try_open_completions_event
(
self
,
event
):
"""Happens when it would be nice to open a completion list, but not
really necessary, for example after a dot, so function
calls won't be made.
"""
lastchar
=
self
.
text
.
get
(
"insert-1c"
)
if
lastchar
==
"."
:
self
.
_open_completions_later
(
False
,
False
,
False
,
COMPLETE_ATTRIBUTES
)
elif
lastchar
in
SEPS
:
self
.
_open_completions_later
(
False
,
False
,
False
,
COMPLETE_FILES
)
def
autocomplete_event
(
self
,
event
):
"""Happens when the user wants to complete his word, and if necessary,
open a completion list after that (if there is more than one
completion)
"""
"(tab) Complete word or open list if multiple options."
if
hasattr
(
event
,
"mc_state"
)
and
event
.
mc_state
or
\
not
self
.
text
.
get
(
"insert linestart"
,
"insert"
).
strip
():
# A modifier was pressed along with the tab or
...
...
@@ -85,34 +70,34 @@ class AutoComplete:
self
.
autocompletewindow
.
complete
()
return
"break"
else
:
opened
=
self
.
open_completions
(
False
,
True
,
True
)
opened
=
self
.
open_completions
(
TAB
)
return
"break"
if
opened
else
None
def
_open_completions_later
(
self
,
*
args
):
self
.
_delayed_completion_index
=
self
.
text
.
index
(
"insert"
)
if
self
.
_delayed_completion_id
is
not
None
:
self
.
text
.
after_cancel
(
self
.
_delayed_completion_id
)
self
.
_delayed_completion_id
=
\
self
.
text
.
after
(
self
.
popupwait
,
self
.
_delayed_open_completions
,
*
args
)
def
_delayed_open_completions
(
self
,
*
args
):
def
try_open_completions_event
(
self
,
event
=
None
):
"(./) Open completion list after pause with no movement."
lastchar
=
self
.
text
.
get
(
"insert-1c"
)
if
lastchar
in
TRIGGERS
:
args
=
TRY_A
if
lastchar
==
"."
else
TRY_F
self
.
_delayed_completion_index
=
self
.
text
.
index
(
"insert"
)
if
self
.
_delayed_completion_id
is
not
None
:
self
.
text
.
after_cancel
(
self
.
_delayed_completion_id
)
self
.
_delayed_completion_id
=
self
.
text
.
after
(
self
.
popupwait
,
self
.
_delayed_open_completions
,
args
)
def
_delayed_open_completions
(
self
,
args
):
"Call open_completions if index unchanged."
self
.
_delayed_completion_id
=
None
if
self
.
text
.
index
(
"insert"
)
==
self
.
_delayed_completion_index
:
self
.
open_completions
(
*
args
)
self
.
open_completions
(
args
)
def
open_completions
(
self
,
evalfuncs
,
complete
,
userWantsWin
,
mode
=
None
):
def
open_completions
(
self
,
args
):
"""Find the completions and create the AutoCompleteWindow.
Return True if successful (no syntax error or so found).
If complete is True, then if there's nothing to complete and no
start of completion, won't open completions and return False.
If mode is given, will open a completion list only in this mode.
Action Function Eval Complete WantWin Mode
^space force_open_completions True, False, True no
. or / try_open_completions False, False, False yes
tab autocomplete False, True, True no
"""
evalfuncs
,
complete
,
wantwin
,
mode
=
args
# Cancel another delayed call, if it exists.
if
self
.
_delayed_completion_id
is
not
None
:
self
.
text
.
after_cancel
(
self
.
_delayed_completion_id
)
...
...
@@ -121,14 +106,14 @@ class AutoComplete:
hp
=
HyperParser
(
self
.
editwin
,
"insert"
)
curline
=
self
.
text
.
get
(
"insert linestart"
,
"insert"
)
i
=
j
=
len
(
curline
)
if
hp
.
is_in_string
()
and
(
not
mode
or
mode
==
COMPLETE_
FILES
):
if
hp
.
is_in_string
()
and
(
not
mode
or
mode
==
FILES
):
# Find the beginning of the string.
# fetch_completions will look at the file system to determine
# whether the string value constitutes an actual file name
# XXX could consider raw strings here and unescape the string
# value if it's not raw.
self
.
_remove_autocomplete_window
()
mode
=
COMPLETE_
FILES
mode
=
FILES
# Find last separator or string start
while
i
and
curline
[
i
-
1
]
not
in
"'
\
"
"
+
SEPS
:
i
-=
1
...
...
@@ -138,17 +123,17 @@ class AutoComplete:
while
i
and
curline
[
i
-
1
]
not
in
"'
\
"
"
:
i
-=
1
comp_what
=
curline
[
i
:
j
]
elif
hp
.
is_in_code
()
and
(
not
mode
or
mode
==
COMPLETE_ATTRIBUTE
S
):
elif
hp
.
is_in_code
()
and
(
not
mode
or
mode
==
ATTR
S
):
self
.
_remove_autocomplete_window
()
mode
=
COMPLETE_ATTRIBUTE
S
mode
=
ATTR
S
while
i
and
(
curline
[
i
-
1
]
in
ID_CHARS
or
ord
(
curline
[
i
-
1
])
>
127
):
i
-=
1
comp_start
=
curline
[
i
:
j
]
if
i
and
curline
[
i
-
1
]
==
'.'
:
if
i
and
curline
[
i
-
1
]
==
'.'
:
# Need object with attributes.
hp
.
set_index
(
"insert-%dc"
%
(
len
(
curline
)
-
(
i
-
1
)))
comp_what
=
hp
.
get_expression
()
if
not
comp_what
or
\
(
not
evalfuncs
and
comp_what
.
find
(
'('
)
!=
-
1
):
if
(
not
comp_what
or
(
not
evalfuncs
and
comp_what
.
find
(
'('
)
!=
-
1
)
)
:
return
None
else
:
comp_what
=
""
...
...
@@ -163,7 +148,7 @@ class AutoComplete:
self
.
autocompletewindow
=
self
.
_make_autocomplete_window
()
return
not
self
.
autocompletewindow
.
show_window
(
comp_lists
,
"insert-%dc"
%
len
(
comp_start
),
complete
,
mode
,
userWantsW
in
)
complete
,
mode
,
wantw
in
)
def
fetch_completions
(
self
,
what
,
mode
):
"""Return a pair of lists of completions for something. The first list
...
...
@@ -185,7 +170,7 @@ class AutoComplete:
return
rpcclt
.
remotecall
(
"exec"
,
"get_the_completion_list"
,
(
what
,
mode
),
{})
else
:
if
mode
==
COMPLETE_ATTRIBUTE
S
:
if
mode
==
ATTR
S
:
if
what
==
""
:
namespace
=
{
**
__main__
.
__builtins__
.
__dict__
,
**
__main__
.
__dict__
}
...
...
@@ -207,7 +192,7 @@ class AutoComplete:
except
:
return
[],
[]
elif
mode
==
COMPLETE_
FILES
:
elif
mode
==
FILES
:
if
what
==
""
:
what
=
"."
try
:
...
...
Lib/idlelib/autocomplete_w.py
View file @
12131230
...
...
@@ -6,7 +6,7 @@ import platform
from
tkinter
import
*
from
tkinter.ttk
import
Frame
,
Scrollbar
from
idlelib.autocomplete
import
COMPLETE_FILES
,
COMPLETE_ATTRIBUTE
S
from
idlelib.autocomplete
import
FILES
,
ATTR
S
from
idlelib.multicall
import
MC_SHIFT
HIDE_VIRTUAL_EVENT_NAME
=
"<<autocompletewindow-hide>>"
...
...
@@ -39,8 +39,7 @@ class AutoCompleteWindow:
self
.
completions
=
None
# A list with more completions, or None
self
.
morecompletions
=
None
# The completion mode. Either autocomplete.COMPLETE_ATTRIBUTES or
# autocomplete.COMPLETE_FILES
# The completion mode, either autocomplete.ATTRS or .FILES.
self
.
mode
=
None
# The current completion start, on the text box (a string)
self
.
start
=
None
...
...
@@ -73,8 +72,8 @@ class AutoCompleteWindow:
def
_binary_search
(
self
,
s
):
"""Find the first index in self.completions where completions[i] is
greater or equal to s, or the last index if there is no such
one.
"""
greater or equal to s, or the last index if there is no such
.
"""
i
=
0
;
j
=
len
(
self
.
completions
)
while
j
>
i
:
m
=
(
i
+
j
)
//
2
...
...
@@ -87,7 +86,8 @@ class AutoCompleteWindow:
def
_complete_string
(
self
,
s
):
"""Assuming that s is the prefix of a string in self.completions,
return the longest string which is a prefix of all the strings which
s is a prefix of them. If s is not a prefix of a string, return s."""
s is a prefix of them. If s is not a prefix of a string, return s.
"""
first
=
self
.
_binary_search
(
s
)
if
self
.
completions
[
first
][:
len
(
s
)]
!=
s
:
# There is not even one completion which s is a prefix of.
...
...
@@ -116,8 +116,10 @@ class AutoCompleteWindow:
return
first_comp
[:
i
]
def
_selection_changed
(
self
):
"""Should be called when the selection of the Listbox has changed.
Updates the Listbox display and calls _change_start."""
"""Call when the selection of the Listbox has changed.
Updates the Listbox display and calls _change_start.
"""
cursel
=
int
(
self
.
listbox
.
curselection
()[
0
])
self
.
listbox
.
see
(
cursel
)
...
...
@@ -153,8 +155,10 @@ class AutoCompleteWindow:
def
show_window
(
self
,
comp_lists
,
index
,
complete
,
mode
,
userWantsWin
):
"""Show the autocomplete list, bind events.
If complete is True, complete the text, and if there is exactly one
matching completion, don't open a list."""
If complete is True, complete the text, and if there is exactly
one matching completion, don't open a list.
"""
# Handle the start we already have
self
.
completions
,
self
.
morecompletions
=
comp_lists
self
.
mode
=
mode
...
...
@@ -300,7 +304,7 @@ class AutoCompleteWindow:
if
keysym
!=
"Tab"
:
self
.
lastkey_was_tab
=
False
if
(
len
(
keysym
)
==
1
or
keysym
in
(
"underscore"
,
"BackSpace"
)
or
(
self
.
mode
==
COMPLETE_
FILES
and
keysym
in
or
(
self
.
mode
==
FILES
and
keysym
in
(
"period"
,
"minus"
)))
\
and
not
(
state
&
~
MC_SHIFT
):
# Normal editing of text
...
...
@@ -329,10 +333,10 @@ class AutoCompleteWindow:
self
.
hide_window
()
return
'break'
elif
(
self
.
mode
==
COMPLETE_ATTRIBUTE
S
and
keysym
in
elif
(
self
.
mode
==
ATTR
S
and
keysym
in
(
"period"
,
"space"
,
"parenleft"
,
"parenright"
,
"bracketleft"
,
"bracketright"
))
or
\
(
self
.
mode
==
COMPLETE_
FILES
and
keysym
in
(
self
.
mode
==
FILES
and
keysym
in
(
"slash"
,
"backslash"
,
"quotedbl"
,
"apostrophe"
))
\
and
not
(
state
&
~
MC_SHIFT
):
# If start is a prefix of the selection, but is not '' when
...
...
@@ -340,7 +344,7 @@ class AutoCompleteWindow:
# selected completion. Anyway, close the list.
cursel
=
int
(
self
.
listbox
.
curselection
()[
0
])
if
self
.
completions
[
cursel
][:
len
(
self
.
start
)]
==
self
.
start
\
and
(
self
.
mode
==
COMPLETE_ATTRIBUTE
S
or
self
.
start
):
and
(
self
.
mode
==
ATTR
S
or
self
.
start
):
self
.
_change_start
(
self
.
completions
[
cursel
])
self
.
hide_window
()
return
None
...
...
Lib/idlelib/idle_test/test_autocomplete.py
View file @
12131230
This diff is collapsed.
Click to expand it.
Misc/NEWS.d/next/IDLE/2019-08-04-17-10-01.bpo-36419.TJZqOc.rst
0 → 100644
View file @
12131230
IDLE - Refactor autocompete and improve testing.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment