Skip to content

PR: Prevent inline comments that include import to hide symbols (Outline)#24383

Merged
ccordoba12 merged 4 commits intospyder-ide:masterfrom
jsbautista:inlineComments
Jun 6, 2025
Merged

PR: Prevent inline comments that include import to hide symbols (Outline)#24383
ccordoba12 merged 4 commits intospyder-ide:masterfrom
jsbautista:inlineComments

Conversation

@jsbautista
Copy link
Copy Markdown
Collaborator

@jsbautista jsbautista commented May 9, 2025

Description of Changes

Issue(s) Resolved

Fixes #24228

Affirmation

By submitting this Pull Request or typing my (user)name below,
I affirm the Developer Certificate of Origin
with respect to all commits and content included in this PR,
and understand I am releasing the same under Spyder's MIT (Expat) license.

I certify the above statement is true and correct:
@jsbautista

…rver.git --branch=fixInlineComments --update --force external-deps/python-lsp-server

subrepo:
  subdir:   "external-deps/python-lsp-server"
  merged:   "c7349d681"
upstream:
  origin:   "https://github.com/jsbautista/python-lsp-server.git"
  branch:   "fixInlineComments"
  commit:   "c7349d681"
git-subrepo:
  version:  "0.4.9"
  origin:   "???"
  commit:   "???"
@ccordoba12
Copy link
Copy Markdown
Member

@jsbautista, please merge with master and then resync our subrepo again to test here your lastest changes in PR python-lsp/python-lsp-server#639

@ccordoba12 ccordoba12 changed the title git subrepo pull --remote=https://github.com/jsbautista/python-lsp-se… PR: Prevent inline comments that include import to hide symbols (Outline) Jun 4, 2025
@ccordoba12 ccordoba12 added this to the v6.1.0a3 milestone Jun 4, 2025
@ccordoba12
Copy link
Copy Markdown
Member

ccordoba12 commented Jun 5, 2025

@jsbautista, I'm going to fix your git history here because only one additional resync should have been made after the merge and we can't squash merge PRs that include updates to our subrepos

subrepo:
  subdir:   "external-deps/python-lsp-server"
  merged:   "f6bfe608d2"
upstream:
  origin:   "https://github.com/jsbautista/python-lsp-server.git"
  branch:   "fixInlineComments"
  commit:   "f6bfe608d2"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "ea10886"
@ccordoba12 ccordoba12 modified the milestones: v6.1.0a3, v6.1.0a4 Jun 5, 2025
…rver.git --branch=develop --update --force external-deps/python-lsp-server

subrepo:
  subdir:   "external-deps/python-lsp-server"
  merged:   "dd03085364"
upstream:
  origin:   "https://github.com/python-lsp/python-lsp-server.git"
  branch:   "develop"
  commit:   "dd03085364"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "ea10886"

[ci skip]
Copy link
Copy Markdown
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

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

Thanks @jsbautista!

@ccordoba12 ccordoba12 merged commit 078f66d into spyder-ide:master Jun 6, 2025
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.

Inline comments including text with import cause functions/classes to disappear when under cells in the Outline explorer

2 participants