Upgrade to Smithy 1.31.0 (#104)

Author: srchase

build.gradle

@@ -157,7 +157,7 @@ publishing {
 
 dependencies {
     implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:0.14.0"
-    implementation "software.amazon.smithy:smithy-model:[1.30.0, 2.0["
+    implementation "software.amazon.smithy:smithy-model:[1.31.0, 2.0["
     implementation 'io.get-coursier:interface:1.0.4'
     implementation 'com.disneystreaming.smithy:smithytranslate-formatter-jvm-java-api:0.3.4'
 

src/main/java/software/amazon/smithy/lsp/SmithyTextDocumentService.java

@@ -551,21 +551,21 @@ private Optional<Shape> getTargetShape(Shape initialShape, String token, Model m
     }
 
     private String getHoverContentsForShape(Shape shape, Model model) {
-        try {
-            String serializedShape = serializeShape(shape, model);
+        List<ValidationEvent> validationEvents = getValidationEventsForShape(shape);
+        String serializedShape = serializeShape(shape, model);
+        if (validationEvents.isEmpty()) {
             return "```smithy\n" + serializedShape + "\n```";
-        } catch (Exception e) {
-            List<ValidationEvent> validationEvents = getValidationEventsForShape(shape);
-            StringBuilder contents = new StringBuilder();
-            contents.append("Can't display shape ").append("`").append(shape.getId().toString()).append("`:");
-            for (ValidationEvent event : validationEvents) {
-                contents.append(System.lineSeparator()).append(event.getMessage());
-            }
-            if (validationEvents.isEmpty()) {
-                contents.append(System.lineSeparator()).append(e);
-            }
-            return contents.toString();
         }
+        StringBuilder contents = new StringBuilder();
+        contents.append("```smithy\n");
+        contents.append(serializedShape);
+        contents.append("\n");
+        contents.append("---\n");
+        for (ValidationEvent event : validationEvents) {
+            contents.append(event.getSeverity() + ": " + event.getMessage() + "\n");
+        }
+        contents.append("```");
+        return contents.toString();
     }
 
     private String serializeShape(Shape shape, Model model) {

src/test/java/software/amazon/smithy/lsp/SmithyTextDocumentServiceTest.java

@@ -214,7 +214,7 @@ public void allowsHoverWhenThereAreUnknownTraits() throws Exception {
     }
 
     @Test
-    public void hoverOnBrokenShapeShowsErrorMessage() throws Exception {
+    public void hoverOnBrokenShapeAppendsValidations() throws Exception {
         Path baseDir = Paths.get(getClass().getResource("ext/models").toURI());
         String modelFilename = "unknown-trait.smithy";
         Path modelFilePath = baseDir.resolve(modelFilename);
@@ -227,7 +227,10 @@ public void hoverOnBrokenShapeShowsErrorMessage() throws Exception {
             TextDocumentIdentifier tdi = new TextDocumentIdentifier(hs.file(modelFilename).toString());
             Hover hover = tds.hover(hoverParams(tdi, 10, 13)).get();
             MarkupContent hoverContent = hover.getContents().getRight();
-            assertTrue(hoverContent.getValue().startsWith("Can't display shape"));
+            assertEquals(hoverContent.getKind(),"markdown");
+            assertTrue(hoverContent.getValue().startsWith("```smithy"));
+            assertTrue(hoverContent.getValue().contains("structure Foo {}"));
+            assertTrue(hoverContent.getValue().contains("WARNING: Unable to resolve trait `com.external#unknownTrait`"));
         }
     }
 
@@ -553,9 +556,9 @@ public void hoverV1() throws Exception {
 
             // Resolves via resource read.
             Hover readHover = tds.hover(hoverParams(mainTdi, 76, 12)).get();
-            correctHover(mainHoverPrefix, "@http(\n    method: \"PUT\"\n    uri: \"/bar\"\n    code: 200\n)\n@readonly\n"
-                    + "operation MyOperation {\n    input: MyOperationInput\n    output: MyOperationOutput\n"
-                    + "    errors: [\n        MyError\n    ]\n}", readHover);
+            assertTrue(readHover.getContents().getRight().getValue().contains("@http(\n    method: \"PUT\"\n    "
+                    + "uri: \"/bar\"\n    code: 200\n)\n@readonly\noperation MyOperation {\n    input: "
+                    + "MyOperationInput\n    output: MyOperationOutput\n    errors: [\n        MyError\n    ]\n}"));
 
             // Does not correspond to shape.
             Hover noMatchHover = tds.hover(hoverParams(mainTdi, 0, 0)).get();
@@ -666,9 +669,9 @@ public void hoverV2() throws Exception {
 
             // Resolves via resource read.
             Hover readHover = tds.hover(hoverParams(mainTdi, 78, 12)).get();
-            correctHover(mainHoverPrefix, "@http(\n    method: \"PUT\"\n    uri: \"/bar\"\n    code: 200\n)\n@readonly\n"
-                    + "operation MyOperation {\n    input: MyOperationInput\n    output: MyOperationOutput\n"
-                    + "    errors: [\n        MyError\n    ]\n}", readHover);
+            assertTrue(readHover.getContents().getRight().getValue().contains("@http(\n    method: \"PUT\"\n    "
+                    + "uri: \"/bar\"\n    code: 200\n)\n@readonly\noperation MyOperation {\n    input: "
+                    + "MyOperationInput\n    output: MyOperationOutput\n    errors: [\n        MyError\n    ]\n}"));
 
             // Does not correspond to shape.
             Hover noMatchHover = tds.hover(hoverParams(mainTdi, 0, 0)).get();