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

feat(engine): translate zero-length prediction #778

Merged
merged 1 commit into from Dec 14, 2023
Merged

feat(engine): translate zero-length prediction #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions src/rime/engine.cc
View file
Open in desktop
Expand Up @@ -162,10 +162,12 @@ void ConcreteEngine::Compose(Context* ctx) {
}
CalculateSegmentation(&comp);
TranslateSegments(&comp);
DLOG(INFO) << "composition: " << comp.GetDebugText();
DLOG(INFO) << "composition: [" << comp.GetDebugText() << "]";
}

void ConcreteEngine::CalculateSegmentation(Segmentation* segments) {
DLOG(INFO) << "CalculateSegmentation, segments: " << segments->size()
<< ", finished? " << segments->HasFinishedSegmentation();
while (!segments->HasFinishedSegmentation()) {
size_t start_pos = segments->GetCurrentStartPosition();
size_t end_pos = segments->GetCurrentEndPosition();
Expand All @@ -189,20 +191,22 @@ void ConcreteEngine::CalculateSegmentation(Segmentation* segments) {
segments->Forward();
}
// start an empty segment only at the end of a confirmed composition.
segments->Trim();
if (!segments->empty() && !segments->back().HasTag("placeholder"))
segments->Trim();
if (!segments->empty() && segments->back().status >= Segment::kSelected)
segments->Forward();
}

void ConcreteEngine::TranslateSegments(Segmentation* segments) {
DLOG(INFO) << "TranslateSegments: " << *segments;
for (Segment& segment : *segments) {
DLOG(INFO) << "segment [" << segment.start << ", " << segment.end
<< "), status: " << segment.status;
if (segment.status >= Segment::kGuess)
continue;
size_t len = segment.end - segment.start;
if (len == 0)
continue;
string input = segments->input().substr(segment.start, len);
DLOG(INFO) << "translating segment: " << input;
DLOG(INFO) << "translating segment: [" << input << "]";
auto menu = New<Menu>();
for (auto& translator : translators_) {
auto translation = translator->Query(input, segment);
Expand Down
2 changes: 1 addition & 1 deletion tools/rime_api_console.cc
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ void print_menu(RimeMenu* menu) {
}

void print_context(RimeContext* context) {
if (context->composition.length > 0) {
if (context->composition.length > 0 || context->menu.num_candidates > 0) {
print_composition(&context->composition);
} else {
printf("(not composing)\n");
Expand Down