Fix language injections sticking after language comment removed (#46134) (cherry-pick to preview)#47790
Merged
JosephTLyons merged 1 commit intov0.221.xfrom Jan 27, 2026
Merged
Conversation
Closes #46104 Release Notes: - Fixed language injections sticking after language comment removed --- This is working well for the Python SQL comments  ```python from pyspark.sql import SparkSession spark = SparkSession.builder.getOrCreate() # sql cmd = "SELECT col1, col2 FROM tbl" df = spark.sql( # sql """ WITH cte AS ( SELECT col1, col2, COUNT(*) AS n FROM tbl GROUP BY ALL ) SELECT * FROM cte """ ) ``` And go comments  ```go package main func test() { var _ = /* sql */ `SELECT id, name FROM products` var _ = /* sql */ "SELECT id, name FROM products" var _ = /* sql */ `SELECT id, name FROM products` var _ = /* sql*/ "SELECT id, name FROM products" } ``` Note: `f04b252dd9` was a simpler implementation that worked for non-inline comments in Python, but produced the following Go behavior  --------- Co-authored-by: Joseph T. Lyons <JosephTLyons@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of #46134 to preview
Closes #46104
Release Notes:
This is working well for the Python SQL comments
And go comments
Note:
f04b252dd9was a simpler implementation that worked fornon-inline comments in Python, but produced the following Go behavior
Co-authored-by: Joseph T. Lyons JosephTLyons@gmail.com