mii/mozc
1
0
Fork 0
mirror of https://github.com/mii443/mozc.git synced 2025-08-22 16:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set composer key before initializing ConversionRequest

Browse Source 
PiperOrigin-RevId: 702996887
This commit is contained in:
Toshiyuki Hanaoka
2024-12-05 07:32:34 +00:00
committed by Hiroyuki Komatsu
parent 014dacd40e
commit 06cd789290
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/converter/converter_main.cc
View File

@ -304,10 +304,10 @@ bool ExecCommand(const ConverterInterface &converter, const std::string &line,
const std::string &func = fields[0];
if (func == "startconversion" || func == "start" || func == "s") {
options.request_type = ConversionRequest::CONVERSION;
const ConversionRequest conversion_request = ConversionRequest(
composer, request, context, *config, std::move(options));
CHECK_FIELDS_LENGTH(2);
composer.SetPreeditTextForTestOnly(fields[1]);
const ConversionRequest conversion_request = ConversionRequest(
composer, request, context, *config, std::move(options));
return converter.StartConversion(conversion_request, segments);
} else if (func == "convertwithnodeinfo" || func == "cn") {
CHECK_FIELDS_LENGTH(5);
@ -327,24 +327,20 @@ bool ExecCommand(const ConverterInterface &converter, const std::string &line,
return converter.StartReverseConversion(segments, fields[1]);
} else if (func == "startprediction" || func == "predict" || func == "p") {
options.request_type = ConversionRequest::PREDICTION;
const ConversionRequest conversion_request = ConversionRequest(
composer, request, context, *config, std::move(options));
if (fields.size() >= 2) {
composer.SetPreeditTextForTestOnly(fields[1]);
return converter.StartPrediction(conversion_request, segments);
} else {
return converter.StartPrediction(conversion_request, segments);
}
const ConversionRequest conversion_request = ConversionRequest(
composer, request, context, *config, std::move(options));
return converter.StartPrediction(conversion_request, segments);
} else if (func == "startsuggestion" || func == "suggest") {
options.request_type = ConversionRequest::SUGGESTION;
const ConversionRequest conversion_request = ConversionRequest(
composer, request, context, *config, std::move(options));
if (fields.size() >= 2) {
composer.SetPreeditTextForTestOnly(fields[1]);
return converter.StartPrediction(conversion_request, segments);
} else {
return converter.StartPrediction(conversion_request, segments);
}
const ConversionRequest conversion_request = ConversionRequest(
composer, request, context, *config, std::move(options));
return converter.StartPrediction(conversion_request, segments);
} else if (func == "finishconversion" || func == "finish") {
options.request_type = ConversionRequest::CONVERSION;
const ConversionRequest conversion_request = ConversionRequest(