Skip to content

Commit e51522f

Browse files
jnthntatumcopybara-github
authored andcommitted
Update abbreviation / import validation.
More closely match the validation in the go and java implementations. PiperOrigin-RevId: 930622025
1 parent 167e797 commit e51522f

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

common/container.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "absl/status/status.h"
2121
#include "absl/status/statusor.h"
22+
#include "absl/strings/ascii.h"
2223
#include "absl/strings/str_cat.h"
2324
#include "absl/strings/string_view.h"
2425
#include "internal/lexis.h"
@@ -92,9 +93,11 @@ absl::Status ExpressionContainer::SetContainer(absl::string_view name) {
9293
}
9394

9495
absl::Status ExpressionContainer::AddAbbreviation(absl::string_view abrev) {
96+
abrev = absl::StripAsciiWhitespace(abrev);
9597
if (!IsValidQualifiedName(abrev)) {
9698
return absl::InvalidArgumentError(
97-
absl::StrCat("invalid qualified name: ", abrev));
99+
absl::StrCat("invalid qualified name: ", abrev,
100+
", wanted name of the form 'qualified.name'"));
98101
}
99102

100103
auto pos = abrev.rfind('.');

0 commit comments

Comments
 (0)