Address comments

Author: milesziemer

src/main/java/software/amazon/smithy/lsp/document/Document.java

@@ -217,7 +217,7 @@ public Range rangeOf(Syntax.Item item) {
      * @return The range of the token, excluding enclosing ""
      */
     public Range rangeOfValue(Syntax.Node.Str token) {
-        int lineStart = indexOfLine(token.line());
+        int lineStart = indexOfLine(token.lineNumber());
         if (lineStart < 0) {
             return null;
         }
@@ -230,7 +230,7 @@ public Range rangeOfValue(Syntax.Node.Str token) {
             endChar -= 1;
         }
 
-        return new Range(new Position(token.line(), startChar), new Position(token.line(), endChar));
+        return new Range(new Position(token.lineNumber(), startChar), new Position(token.lineNumber(), endChar));
     }
 
     /**

src/main/java/software/amazon/smithy/lsp/language/ReferencesHandler.java

@@ -73,14 +73,14 @@ static Config create(Project project, IdlFile idlFile, Position position) {
         private static ResponseErrorException notSupported() {
             var error = new ResponseError();
             error.setCode(ResponseErrorCode.RequestFailed);
-            error.setMessage("Not supported here.");
+            error.setMessage("Finding references not supported here.");
             return new ResponseErrorException(error);
         }
 
         private static ResponseErrorException noModel() {
             var error = new ResponseError();
             error.setCode(ResponseErrorCode.RequestFailed);
-            error.setMessage("Model is too broken.");
+            error.setMessage("Model is too broken to find references.");
             return new ResponseErrorException(error);
         }
     }

src/main/java/software/amazon/smithy/lsp/language/RenameHandler.java

@@ -106,13 +106,12 @@ private void deconflictDefinition() {
                 return;
             }
 
-            var conflictingShape = ShapeSearch.findShape(sourceFile.getParse(), conflictingId, config.model())
-                    .orElse(null);
-            if (conflictingShape == null) {
+            var conflictingShape = ShapeSearch.findShape(sourceFile.getParse(), conflictingId, config.model());
+            if (conflictingShape.isEmpty()) {
                 return;
             }
 
-            var references = References.findReferences(config.model(), conflictingShape, sourceFile);
+            var references = References.findReferences(config.model(), conflictingShape.get(), sourceFile);
             for (var fileReferences : references.fileReferences()) {
                 addConflictRenames(fileReferences, conflictingId);
             }

src/main/java/software/amazon/smithy/lsp/syntax/Syntax.java

@@ -293,18 +293,18 @@ public List<Node> elements() {
          * identifiers, so this class a single subclass {@link Ident}.
          */
         public static sealed class Str extends Node {
-            final int line;
+            final int lineNumber;
             final String value;
 
-            Str(int line, int start, int end, String value) {
-                this.line = line;
+            Str(int lineNumber, int start, int end, String value) {
+                this.lineNumber = lineNumber;
                 this.start = start;
                 this.end = end;
                 this.value = value;
             }
 
-            public int line() {
-                return line;
+            public int lineNumber() {
+                return lineNumber;
             }
 
             public String stringValue() {
@@ -806,8 +806,8 @@ public String message() {
     public static final class Ident extends Node.Str {
         static final Ident EMPTY = new Ident(-1, -1, -1, "");
 
-        Ident(int line, int start, int end, String value) {
-            super(line, start, end, value);
+        Ident(int lineNumber, int start, int end, String value) {
+            super(lineNumber, start, end, value);
         }
 
         public boolean isEmpty() {

src/test/java/software/amazon/smithy/lsp/language/ReferencesHandlerTest.java

@@ -292,7 +292,7 @@ public void unsupportedReferences() {
 
         for (var position : twp.positions()) {
             assertThat(() -> ReferencesHandler.Config.create(project, idlFile, position),
-                    throwsWithMessage(containsString("Not supported")));
+                    throwsWithMessage(containsString("not supported")));
         }
     }