Merge branch 'smithy-lang:main' into dss

gradle.properties

@@ -1 +1 @@
-smithyVersion=1.41.0
+smithyVersion=1.42.0

src/test/java/software/amazon/smithy/lsp/ext/SmithyProjectTest.java

@@ -493,6 +493,14 @@ public void shapeIdFromLocationV2() throws Exception {
                     new Position(160,8)).get());
             assertEquals(ShapeId.from("com.example#OtherStructure"), project.getShapeIdFromLocation(testUri,
                     new Position(7, 15)).get());
+            assertEquals(ShapeId.from("com.foo#ShortI"), project.getShapeIdFromLocation(uri,
+                new Position(210,5)).get());
+            assertEquals(ShapeId.from("com.foo#ShortI$c"), project.getShapeIdFromLocation(uri,
+                new Position(211,6)).get());
+            assertEquals(ShapeId.from("com.foo#ShortO"), project.getShapeIdFromLocation(uri,
+                new Position(215,5)).get());
+            assertEquals(ShapeId.from("com.foo#ShortO$d"), project.getShapeIdFromLocation(uri,
+                new Position(216,6)).get());
         }
     }
 

src/test/resources/software/amazon/smithy/lsp/ext/models/v2/main.smithy

@@ -201,3 +201,18 @@ structure FalseInlinedReversedBarOutput {
 
 @trait
 structure emptyTraitStruct {}
+
+operation ShortInputOutput {
+    output: ShortO
+    input: ShortI
+}
+
+@input
+structure ShortI {
+    c: String
+}
+
+@output
+structure ShortO {
+    d: String
+}