Revert "Fix selector parsing with errant break tokens" (#3080)

This reverts commit 6f72eec.

Author: yasmewad

.changes/next-release/bugfix-d3f8cb56f24737e46d719b83f7f8bff142c3c705.json

@@ -47,12 +47,7 @@ static Selector parse(String selector) {
     }
 
     List<InternalSelector> parse() {
-        List<InternalSelector> result = recursiveParse();
-        ws();
-        if (!eof()) {
-            throw syntax("Unexpected selector character: " + peek());
-        }
-        return result;
+        return recursiveParse();
     }
 
     private List<InternalSelector> recursiveParse() {

smithy-model/src/main/java/software/amazon/smithy/model/selector/SelectorParser.java

@@ -901,7 +901,7 @@ public void canQueryVariablesAtPointTheyWereMatched() {
                         + "~>\n"
                         + "operation\n"
                         + "[trait|auth]"
-                        + ":not([@: @{trait|auth|(values)} {<} @{var|authTraits|id}])");
+                        + ":not([@: @{trait|auth|(values)} {<} @{var|authTraits|id}]))");
 
         List<Pair<Shape, Map<String, Set<Shape>>>> results = new ArrayList<>();
         selector.runner().model(result).selectMatches((s, vars) -> results.add(Pair.of(s, vars)));
@@ -1195,28 +1195,4 @@ public void rootDoesNotSupportMoreThanOneSelector() {
     public void rootRequiresOneSelector() {
         Assertions.assertThrows(SelectorSyntaxException.class, () -> Selector.parse(":root()"));
     }
-
-    @Test
-    public void rejectsTopLevelComma() {
-        SelectorSyntaxException e = Assertions.assertThrows(
-                SelectorSyntaxException.class,
-                () -> Selector.parse("string, integer"));
-        assertThat(e.getMessage(), containsString(","));
-    }
-
-    @Test
-    public void rejectsUnmatchedTopLevelCloseBracket() {
-        SelectorSyntaxException e = Assertions.assertThrows(
-                SelectorSyntaxException.class,
-                () -> Selector.parse("string ] extra"));
-        assertThat(e.getMessage(), containsString("]"));
-    }
-
-    @Test
-    public void rejectsUnmatchedTopLevelCloseParen() {
-        SelectorSyntaxException e = Assertions.assertThrows(
-                SelectorSyntaxException.class,
-                () -> Selector.parse("string ) extra"));
-        assertThat(e.getMessage(), containsString(")"));
-    }
 }

smithy-model/src/test/java/software/amazon/smithy/model/selector/SelectorTest.java

@@ -10,7 +10,7 @@ namespace com.amazonaws.simple
         message: "Document types are not supported"
     }
     "com.amazonaws.simple.myProtocol.NoEventStreams": {
-        selector: "~> operation -[input, output]-> :test(> member > union [trait|streaming])"
+        selector: "~> operation -[input, output]-> :test(> member > union [trait|streaming]))"
         message: "Event streams are not supported"
     }
     "com.amazonaws.simple.myProtocol.NoErrors": {

smithy-model/src/test/resources/software/amazon/smithy/model/errorfiles/validators/traitValidators/find-incompatible-shapes.smithy

@@ -26,7 +26,7 @@ metadata selectorTests = [
         ~>
         operation
         [trait|auth]
-        :not([@: @{trait|auth|(values)} {<} @{var|authTraits|id}])
+        :not([@: @{trait|auth|(values)} {<} @{var|authTraits|id}]))
         """
         matches: [
             smithy.example#HasDigestAuth