Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid substring if not suffixed #133

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Avoid substring if not suffixed #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
425d229
Add a test for input/output fix
daddykotex Nov 28, 2023
5a624a8
Avoid substring if not suffixed
daddykotex Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/software/amazon/smithy/lsp/ext/FileCachingCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,10 @@ private Optional<OperationShape> getOperationForInlinedInputOrOutput(Shape shape
String suffix = getOperationInputOrOutputSuffix(shape, preamble);
String shapeName = shape.getId().getName();

String matchingOperationName = shapeName.substring(0, shapeName.length() - suffix.length());
String matchingOperationName =
shapeName.endsWith(suffix)
? shapeName.substring(0, shapeName.length() - suffix.length())
: shapeName;
ShapeId matchingOperationId = ShapeId.fromParts(shape.getId().getNamespace(), matchingOperationName);

return model.shapes(OperationShape.class)
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/software/amazon/smithy/lsp/ext/SmithyProjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

Expand Down
15 changes: 15 additions & 0 deletions src/test/resources/software/amazon/smithy/lsp/ext/models/v2/main.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Loading