[PT Run] Calculator plugin: Various improvements #18159

htcfreek · 2022-05-08T15:39:31Z

Summary of the Pull Request

What is this about:
This PR implements various improvements for the plugin.

What is included in the PR:
FIXES:

No output on queries like 1 or -1 and pi (No existing issue yet.)
Crash on empty query with keyword
Log doesn't contains the query on crash
Fix crashes in InputValid(System.String)
- System.ArgumentNullException if only action char is entered and search term is empty
Fix crashes in CalculateEngine.Interpret()
- System.FormatException on incorrect query when the result is converted to an error message
- System.InvalidCastException (Unable to cast object of type 'System.Double[,]' to type 'System.IConvertible'. on query =[10,10]

NEW FEATURES:

Error message result on failed calculation
The following exceptions in CalculateEngine.Interpret() aren't fixed and were used to show an error message to the user when searching with keyword.
- Mages.Core.ParseException
- System.OverflowException (Value was either too large or too small for a Decimal.)
Log expected errors as error instead of exception
Plugin settings for choosing input and output culture: [PT Run] Calculator interprets comma used as number separator as decimal separator #17300 (comment)

REMOVED:

Reverted [PTRun][Calculator]Always accept decimal point #16980 because of the new settings

How does someone test / validate:

Input of the following queries on my local build:
- =
- =+pi(2)
- =pi,
- =log()
- =pi
- =[10,9]
- =2^96
Update and run tests

Quality Checklist

Contributor License Agreement (CLA)

A CLA must be signed. If not, go over here and sign the CLA.

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Main.cs

.../Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs

github-actions · 2022-05-22T10:31:43Z

@check-spelling-bot Report

🔴 Please review

See the files view or the action log for details.

Unrecognized words (2)

intepreted
occured

Previously acknowledged words that are now absent

BGSOUNDS BUILDARCH CLIENTPULL dispid DISPIDAMBIENTDLCONTROL DLACTIVEXCTLS DLCONTROL DLIMAGES DOWNLOADONLY epo FANCYZONESWINDOWSTYLES FORCEOFFLINE FRAMEDOWNLOAD gsuberland HFONT Htmdid ICore IDCANCEL IDOK INITDIALOG IReflect IWindows IXaml lamotile METACHARSET mirophone mshtmdid NETFX netstandard Nvidia otating Postion preperty Redist ruleset RUNACTIVEXCTLS serizalization settingsv Setttings sourceid testtrocess Toolchain VDId xbf XBind XInstance

To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the [email protected]:htcfreek/PowerToys.git repository
on the PT_Calc branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
-H "Content-Type: application/json" \
"https://api.github.com/repos/microsoft/PowerToys/issues/comments/1133865800" > "$comment_json"
comment_body=$(mktemp)
jq -r ".body // empty" "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")

patch_add=$(perl -e '$/=undef; $_=<>; if (m{Unrecognized words[^<]*</summary>\n*```\n*([^<]*)```\n*</details>$}m) { print "$1" } elsif (m{Unrecognized words[^<]*\n\n((?:\w.*\n)+)\n}m) { print "$1" };' < "$comment_body")

update_files
rm $comment_body
git add -u

If the flagged items do not appear to be text

If items relate to a ...

well-formed pattern.

If you can write a pattern that would match it,
try adding it to the patterns.txt file.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.
binary file.

Please add a file path to the excludes.txt file matching the containing file.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

github-actions · 2022-05-22T11:50:56Z

@check-spelling-bot Report

🔴 Please review

See the files view or the action log for details.

Unrecognized words (2)

Mothod
Qeury

Previously acknowledged words that are now absent

BGSOUNDS BUILDARCH CLIENTPULL dispid DISPIDAMBIENTDLCONTROL DLACTIVEXCTLS DLCONTROL DLIMAGES DOWNLOADONLY epo FANCYZONESWINDOWSTYLES FORCEOFFLINE FRAMEDOWNLOAD gsuberland HFONT Htmdid ICore IDCANCEL IDOK INITDIALOG IReflect IWindows IXaml lamotile METACHARSET mirophone mshtmdid NETFX netstandard Nvidia otating Postion preperty Redist ruleset RUNACTIVEXCTLS serizalization settingsv Setttings sourceid testtrocess Toolchain VDId xbf XBind XInstance

To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the [email protected]:htcfreek/PowerToys.git repository
on the PT_Calc branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
-H "Content-Type: application/json" \
"https://api.github.com/repos/microsoft/PowerToys/issues/comments/1133878682" > "$comment_json"
comment_body=$(mktemp)
jq -r ".body // empty" "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")

patch_add=$(perl -e '$/=undef; $_=<>; if (m{Unrecognized words[^<]*</summary>\n*```\n*([^<]*)```\n*</details>$}m) { print "$1" } elsif (m{Unrecognized words[^<]*\n\n((?:\w.*\n)+)\n}m) { print "$1" };' < "$comment_body")

update_files
rm $comment_body
git add -u

If the flagged items do not appear to be text

If items relate to a ...

well-formed pattern.

If you can write a pattern that would match it,
try adding it to the patterns.txt file.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.
binary file.

Please add a file path to the excludes.txt file matching the containing file.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/ErrorHandler.cs

github-actions · 2022-05-29T11:59:56Z

@check-spelling-bot Report

🔴 Please review

See the files view or the action log for details.

Unrecognized words (3)

braket
schown
ueser

Previously acknowledged words that are now absent

BGSOUNDS BUILDARCH CLIENTPULL dispid DISPIDAMBIENTDLCONTROL DLACTIVEXCTLS DLCONTROL DLIMAGES DOWNLOADONLY epo FANCYZONESWINDOWSTYLES FORCEOFFLINE FRAMEDOWNLOAD gsuberland HFONT Htmdid ICore IDCANCEL IDOK INITDIALOG IReflect IWindows IXaml lamotile METACHARSET mirophone mshtmdid NETFX netstandard Nvidia otating Postion preperty Redist ruleset RUNACTIVEXCTLS serizalization settingsv Setttings sourceid testtrocess Toolchain VDId xbf XBind XInstance

To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the [email protected]:htcfreek/PowerToys.git repository
on the PT_Calc branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
-H "Content-Type: application/json" \
"https://api.github.com/repos/microsoft/PowerToys/issues/comments/1140434113" > "$comment_json"
comment_body=$(mktemp)
jq -r ".body // empty" "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")

patch_add=$(perl -e '$/=undef; $_=<>; if (m{Unrecognized words[^<]*</summary>\n*```\n*([^<]*)```\n*</details>$}m) { print "$1" } elsif (m{Unrecognized words[^<]*\n\n((?:\w.*\n)+)\n}m) { print "$1" };' < "$comment_body")

update_files
rm $comment_body
git add -u

If the flagged items do not appear to be text

If items relate to a ...

well-formed pattern.

If you can write a pattern that would match it,
try adding it to the patterns.txt file.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.
binary file.

Please add a file path to the excludes.txt file matching the containing file.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

jaimecbernardo

Changes look good to me!
Thanks a lot for the contribution!
This is a big quality of life fix.

htcfreek added 2 commits May 8, 2022 17:30

crash fixes and error result

8de8083

small changes and test fixes

9a4d9f4

htcfreek self-assigned this May 8, 2022

htcfreek added Issue-Bug Something isn't working Idea-Enhancement New feature or request on an existing product Product-PowerToys Run Improved app launch PT Run (Win+R) Window labels May 8, 2022

improve exceptions and message

942deac

htcfreek commented May 8, 2022

View reviewed changes

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/Main.cs Outdated Show resolved Hide resolved

htcfreek changed the title ~~[PT Run] Various improvements~~ [PT Run] Calculator plugin: Various improvements May 8, 2022

htcfreek added 2 commits May 8, 2022 21:20

double array crash fix

a374790

overflowexception

d33c2e4

htcfreek commented May 9, 2022

View reviewed changes

.../Plugins/Microsoft.PowerToys.Run.Plugin.Calculator.UnitTest/ExtendedCalculatorParserTests.cs Show resolved Hide resolved

htcfreek commented May 9, 2022

View reviewed changes

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateHelper.cs Outdated Show resolved Hide resolved

htcfreek commented May 11, 2022

View reviewed changes

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/CalculateEngine.cs Show resolved Hide resolved

htcfreek added 4 commits May 22, 2022 11:00

Merge branch 'microsoft:main' into PT_Calc

434e2fd

improve error handling

c429d2d

varous improvements

e6ee436

varous improvements

7b5b963

htcfreek added 6 commits May 22, 2022 12:34

fix spelling

746cc24

fix spelling

6fad350

Revert microsoft#16980

f379dcc

add description

86726d3

error improvemenet

9319816

Update tests

f56795c

spelling fixes

7adafac

htcfreek commented May 22, 2022

View reviewed changes

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/ErrorHandler.cs Outdated Show resolved Hide resolved

htcfreek commented May 23, 2022

View reviewed changes

src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.Calculator/ErrorHandler.cs Outdated Show resolved Hide resolved

Merge branch 'microsoft:main' into PT_Calc

3d4b885

htcfreek added 5 commits May 29, 2022 11:25

small changes

08420fb

add settings

2bb95d1

last changes

8a9d9a8

fix description

2367bd6

update dev docs

480a349

spell check

0ddd050

htcfreek marked this pull request as ready for review May 29, 2022 12:03

htcfreek requested review from jaimecbernardo and stefansjfw May 29, 2022 12:03

htcfreek added the Needs-Review This Pull Request awaits the review of a maintainer. label May 29, 2022

This was referenced May 29, 2022

[PowerToys] Run: Update calculator section and add service plugin MicrosoftDocs/windows-dev-docs#3860

Merged

[Run][Calculator plugin] Wrong result when there are lots of decimal places #9309

Closed

jaimecbernardo approved these changes Jun 1, 2022

View reviewed changes

jaimecbernardo merged commit 465df35 into microsoft:main Jun 2, 2022

htcfreek deleted the PT_Calc branch June 3, 2022 20:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PT Run] Calculator plugin: Various improvements #18159

[PT Run] Calculator plugin: Various improvements #18159

htcfreek commented May 8, 2022 •

edited

Loading

github-actions bot commented May 22, 2022 •

edited

Loading

github-actions bot commented May 22, 2022 •

edited

Loading

github-actions bot commented May 29, 2022 •

edited

Loading

jaimecbernardo left a comment

[PT Run] Calculator plugin: Various improvements #18159

[PT Run] Calculator plugin: Various improvements #18159

Conversation

htcfreek commented May 8, 2022 • edited Loading

Summary of the Pull Request

Quality Checklist

Contributor License Agreement (CLA)

github-actions bot commented May 22, 2022 • edited Loading

@check-spelling-bot Report

🔴 Please review

Unrecognized words (2)

github-actions bot commented May 22, 2022 • edited Loading

@check-spelling-bot Report

🔴 Please review

Unrecognized words (2)

github-actions bot commented May 29, 2022 • edited Loading

@check-spelling-bot Report

🔴 Please review

Unrecognized words (3)

jaimecbernardo left a comment

Choose a reason for hiding this comment

htcfreek commented May 8, 2022 •

edited

Loading

github-actions bot commented May 22, 2022 •

edited

Loading

github-actions bot commented May 22, 2022 •

edited

Loading

github-actions bot commented May 29, 2022 •

edited

Loading