[PATCH] D91970: [lld/mac] Implement basic typo correction for flags

[Nico Weber via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG11b762583316: [lld/mac] Implement basic typo correction for flags (authored by thakis).
Herald added subscribers: MaskRay, arichardson, emaste.
Herald added a reviewer: espindola.
Herald added a reviewer: MaskRay.
Herald added a project: LLVM.

Changed prior to commit:
  https://reviews.llvm.org/D91970?vs=307081&id=307373#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D91970/new/

https://reviews.llvm.org/D91970

Files:
  lld/COFF/DriverUtils.cpp
  lld/ELF/DriverUtils.cpp
  lld/MachO/DriverUtils.cpp
  lld/test/MachO/color-diagnostics.test
  lld/test/MachO/driver.test
  lld/test/MachO/silent-ignore.test


Index: lld/test/MachO/silent-ignore.test
===================================================================
--- lld/test/MachO/silent-ignore.test
+++ lld/test/MachO/silent-ignore.test
@@ -9,4 +9,4 @@
 RUN:   -ios_simulator_version_min 9.0.0 \
 RUN:   -sdk_version 13.2
 RUN: not %lld -v --not-an-ignored-argument 2>&1 | FileCheck %s
-CHECK: error: unknown argument: --not-an-ignored-argument
+CHECK: error: unknown argument '--not-an-ignored-argument'
Index: lld/test/MachO/driver.test
===================================================================
--- /dev/null
+++ lld/test/MachO/driver.test
@@ -0,0 +1,5 @@
+# RUN: not %lld ---help 2>&1 | FileCheck -check-prefix=SPELLHELP %s
+
+SPELLHELP: error: unknown argument '---help', did you mean '--help'
+# FIXME: This should say "no input files" instead
+SPELLHELP: error: undefined symbol: _main
Index: lld/test/MachO/color-diagnostics.test
===================================================================
--- lld/test/MachO/color-diagnostics.test
+++ lld/test/MachO/color-diagnostics.test
@@ -6,7 +6,7 @@
 # RUN: not %lld -xyz --color-diagnostics=always /nosuchfile 2>&1 \
 # RUN:   | FileCheck -check-prefix=COLOR %s
 
-# COLOR: {{lld: .\[0;31merror: .\[0munknown argument: -xyz}}
+# COLOR: {{lld: .\[0;31merror: .\[0munknown argument '-xyz'}}
 # COLOR: {{lld: .\[0;31merror: .\[0mcannot open /nosuchfile}}
 
 # RUN: not %lld --color-diagnostics=foobar 2>&1 | FileCheck -check-prefix=ERR %s
Index: lld/MachO/DriverUtils.cpp
===================================================================
--- lld/MachO/DriverUtils.cpp
+++ lld/MachO/DriverUtils.cpp
@@ -75,8 +75,14 @@
 
   handleColorDiagnostics(args);
 
-  for (opt::Arg *arg : args.filtered(OPT_UNKNOWN))
-    error("unknown argument: " + arg->getSpelling());
+  for (opt::Arg *arg : args.filtered(OPT_UNKNOWN)) {
+    std::string nearest;
+    if (findNearest(arg->getAsString(args), nearest) > 1)
+      error("unknown argument '" + arg->getAsString(args) + "'");
+    else
+      error("unknown argument '" + arg->getAsString(args) +
+            "', did you mean '" + nearest + "'");
+  }
   return args;
 }
 
Index: lld/ELF/DriverUtils.cpp
===================================================================
--- lld/ELF/DriverUtils.cpp
+++ lld/ELF/DriverUtils.cpp
@@ -133,7 +133,7 @@
   if (missingCount)
     error(Twine(args.getArgString(missingIndex)) + ": missing argument");
 
-  for (auto *arg : args.filtered(OPT_UNKNOWN)) {
+  for (opt::Arg *arg : args.filtered(OPT_UNKNOWN)) {
     std::string nearest;
     if (findNearest(arg->getAsString(args), nearest) > 1)
       error("unknown argument '" + arg->getAsString(args) + "'");
Index: lld/COFF/DriverUtils.cpp
===================================================================
--- lld/COFF/DriverUtils.cpp
+++ lld/COFF/DriverUtils.cpp
@@ -852,7 +852,7 @@
 
   handleColorDiagnostics(args);
 
-  for (auto *arg : args.filtered(OPT_UNKNOWN)) {
+  for (opt::Arg *arg : args.filtered(OPT_UNKNOWN)) {
     std::string nearest;
     if (optTable.findNearest(arg->getAsString(args), nearest) > 1)
       warn("ignoring unknown argument '" + arg->getAsString(args) + "'");


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D91970.307373.patch
Type: text/x-patch
Size: 3145 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201124/fcee0fb6/attachment.bin>