Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Correctly hide calltip when matching closing parenthesis #3984

Merged
merged 9 commits into from
Apr 11, 2017

Conversation

dalthviz
Copy link
Member

Fixes #3967

@dalthviz dalthviz added this to the v3.1.1 milestone Jan 18, 2017
@dalthviz dalthviz self-assigned this Jan 18, 2017
@dalthviz dalthviz changed the base branch from master to 3.1.x January 18, 2017 04:37
@ccordoba12 ccordoba12 modified the milestones: v3.1.1, v3.1.2, v3.1.3 Jan 18, 2017
@ccordoba12 ccordoba12 modified the milestones: v3.1.3, v3.1.4 Jan 28, 2017
@goanpeca goanpeca requested a review from ccordoba12 February 17, 2017 21:05
@ccordoba12
Copy link
Member

ccordoba12 commented Apr 11, 2017

@dalthviz, this has merge conflicts. Please merge with 3.1.x to solve them.

"""Hide the calltip in the editor when a matching ')' is found."""
# Load test file
text = 'a = [1,2,3]\n(max'
test_file = osp.join(LOCATION, 'edit_calltip.py')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dalthviz, can't we get rid of this file and use instead an empty file?

@ccordoba12
Copy link
Member

ccordoba12 commented Apr 11, 2017

The test you added is hanging on Linux and PyQt5. Please skip it when those conditions are met.

@ccordoba12
Copy link
Member

@dalthviz, I think this is ready. The failure in CircleCI is unrelated to your work and I'm fixing it in another PR.

@ccordoba12 ccordoba12 changed the title PR: Hide calltip with a matching ')' PR: Correctly hide calltip when matching ') Apr 11, 2017
@ccordoba12 ccordoba12 changed the title PR: Correctly hide calltip when matching ') PR: Correctly hide calltip when matching closing parenthesis Apr 11, 2017
@ccordoba12 ccordoba12 merged commit 663f8c9 into spyder-ide:3.1.x Apr 11, 2017
ccordoba12 added a commit that referenced this pull request Apr 11, 2017
ccordoba12 added a commit that referenced this pull request Apr 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants