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

search for function* #3114

Merged
merged 3 commits into from
Mar 3, 2021
Merged

search for function* #3114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9cbf66
search for function*
peterbe Mar 3, 2021
7dc77c1
feedbacked
peterbe Mar 3, 2021
410691d
Merge branch 'main' into 3113-search-for-function
peterbe Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion deployer/src/deployer/search/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,15 +267,16 @@ def analyze(
connections.create_connection(hosts=[url])
index = Document._index
analysis = index.analyze(body={"text": text, "analyzer": analyzer})
print(f"For text: {text!r}")
if "tokens" in analysis:
keys = None
for token in analysis["tokens"]:
if keys is None:
keys = token.keys()
longest_key = max(len(x) for x in keys)
print()
for key in keys:
print(f"{key:{longest_key + 1}} {token[key]!r}")
print()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just needed the above fixed for my local debugging because after I've run the indexing I run many different variables of

poetry run deployer search-analyze "function*"

elif not analysis:
print("No tokens found!")
else:
Expand Down
24 changes: 23 additions & 1 deletion deployer/src/deployer/search/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,24 @@
replacement="_$1_",
)

special_charater_name_char_filter = char_filter(
"special_charater_name_char_filter",
type="pattern_replace",
# In Java, this matches things like `yield*`, `Function*` and `data-*`.
# But not that it will also match things like: `x*y` or `*emphasis*` which
# is a "risk" worth accepting because event `*emphasis*` would get converted
# to `emphasisstar` which is more accurate than letting the standard tokenizer
# turn it into `emphasis` alone.
pattern="(\\w+)-?\\*",
# Now a search for `yield*` becomes a search for `yieldstar` which won't
# get confused for `yield`.
# We *could* consider changing the replacement for `$1__starcharacter` which means
# it would tokenize `yield*` into `[yieldstarcharacter, yield, starcharacter]`
# which might capture people who didn't expect to find the page about `yield`
# when they searched for `yield*`.
replacement="$1star",
)

unicorns_char_filter = char_filter(
"unicorns_char_filter",
type="mapping",
Expand Down Expand Up @@ -136,7 +154,11 @@
# Note that we don't use the `html_strip` char_filter.
# With that, we'd lose some of the valueable characters like: `<video>` which
# is an actual title.
char_filter=[unicorns_char_filter, keep_html_char_filter],
char_filter=[
unicorns_char_filter,
special_charater_name_char_filter,
keep_html_char_filter,
],
)


Expand Down