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

Jump to bottom

Temporary workaround to avoid NPE #34

Merged
merged 2 commits into from
Sep 15, 2022
Merged

Temporary workaround to avoid NPE #34

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
0fa8b9b
Temporary workaround to avoid NPE
daddykotex Sep 15, 2022
5b5d625
Bump smithy to 1.25.0
daddykotex Sep 15, 2022
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
2 changes: 1 addition & 1 deletion build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object lsp extends MavenModule with PublishModule {

def ivyDeps = Agg(
ivy"org.eclipse.lsp4j:org.eclipse.lsp4j:0.14.0",
ivy"software.amazon.smithy:smithy-model:1.23.1",
ivy"software.amazon.smithy:smithy-model:1.25.0",
ivy"io.get-coursier:interface:1.0.4"
)

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/software/amazon/smithy/lsp/ext/SmithyProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,9 @@ private static void collectMemberLocations(
) {
for (Map.Entry<ShapeId, List<MemberShape>> entry : containerMembersMap.entrySet()) {
Location containerLocation = locations.get(entry.getKey());
if (containerLocation == null) {
continue;
}
Range containerLocationRange = containerLocation.getRange();
int memberEndMarker = containerLocationRange.getEnd().getLine();
// Keep track of previous line to make sure that end marker has been advanced.
Expand Down