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.

Sign up for GitHub

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

Jump to bottom

Refactor JinjaTracer: Split into two classes, break up _slice_template() function #2870

Merged
merged 18 commits into from Mar 16, 2022
Merged

Refactor JinjaTracer: Split into two classes, break up _slice_template() function #2870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
048e10a
Minor cleanup/refactor of JinjaTracer
Mar 15, 2022
212a885
More refactoring
Mar 15, 2022
e562925
More refactoring
Mar 15, 2022
8f4ec6f
More refactoring
Mar 15, 2022
e68510f
Add more type annotations
Mar 15, 2022
89de547
Extract a function track_block_end() out of update_next_slice_indices()
Mar 15, 2022
b18c6a7
Make some functions static
Mar 15, 2022
dc15b3f
Split up _slice_template() some more
Mar 15, 2022
2170fb6
More types and tidying
Mar 15, 2022
fd1e552
RawSliceInfo: Provide default value for next_slice_indices
Mar 16, 2022
4129044
Use RawSliceInfo instance instead of alt_id/alt_code variables
Mar 16, 2022
9171712
Split JinjaTracer into two classes: JinjaAnalyzer and JinjaTracer
Mar 16, 2022
a642326
Make idx a field, rename as idx_raw
Mar 16, 2022
5bdc8a8
Tidying
Mar 16, 2022
aadd5e8
PR review
Mar 16, 2022
0cd54db
PR review
Mar 16, 2022
b324f59
Add explanatory comment about str_buff and str_parts
Mar 16, 2022
e9f9aa3
Merge branch 'main' into bhart-jinja_tracer_tidying
barrywhart Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions requirements_dev.txt
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ types-chardet
types-appdirs
types-colorama
types-pyyaml
types-Jinja2
Copy link
Member Author

Choose a reason for hiding this comment

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

Unrelated to the rest of the PR, but I noticed we were missing this

types-regex
# Requests is required for the util script
requests
Expand Down
5 changes: 3 additions & 2 deletions src/sqlfluff/core/templaters/jinja.py
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
TemplatedFileSlice,
)
from sqlfluff.core.templaters.python import PythonTemplater
from sqlfluff.core.templaters.slicers.tracer import JinjaTracer
from sqlfluff.core.templaters.slicers.tracer import JinjaAnalyzer


# Instantiate the templater logger
Expand Down Expand Up @@ -413,6 +413,7 @@ def slice_file(
templater_logger.info("Slicing File Template")
templater_logger.debug(" Raw String: %r", raw_str)
templater_logger.debug(" Templated String: %r", templated_str)
tracer = JinjaTracer(raw_str, self._get_jinja_env(), make_template)
analyzer = JinjaAnalyzer(raw_str, self._get_jinja_env())
tracer = analyzer.analyze(make_template)
trace = tracer.trace()
return trace.raw_sliced, trace.sliced_file, trace.templated_str