Refactor: clean up documentText.

Author: cristianoc

src/rescript-editor-support/MessageHandlers.re

@@ -42,7 +42,7 @@ let handlers:
       let%try (uri, pos) = Protocol.rPositionParams(params);
       let maybeText =
         switch (Hashtbl.find_opt(state.documentText, uri)) {
-        | Some((text, _version, _isClean)) => Some(text)
+        | Some(text) => Some(text)
         | None => None
         };
       let%try (package, full) = State.getFullFromCmt(~state, ~uri);

src/rescript-editor-support/NotificationHandlers.re

@@ -5,9 +5,8 @@ module J = JsonShort;
 
 let getTextDocument = doc => {
   let%opt uri = Json.get("uri", doc) |?> Json.string;
-  let%opt version = Json.get("version", doc) |?> Json.number;
   let%opt text = Json.get("text", doc) |?> Json.string;
-  Some((uri, version, text));
+  Some((uri, text));
 };
 
 let watchedFileContentsMap = Hashtbl.create(100);
@@ -22,15 +21,11 @@ let notificationHandlers:
   (
     "textDocument/didOpen",
     (state, params) => {
-      let%try (uri, version, text) =
+      let%try (uri, text) =
         Json.get("textDocument", params)
         |?> getTextDocument
         |> RResult.orError("Invalid params");
-      Hashtbl.replace(
-        state.documentText,
-        uri,
-        (text, int_of_float(version), true),
-      );
+      Hashtbl.replace(state.documentText, uri, text);
 
       let%try path = Utils.parseUri(uri) |> RResult.orError("Invalid uri");
       if (FindFiles.isSourceFile(path)) {
@@ -76,14 +71,13 @@ let notificationHandlers:
       open InfixResult;
       let%try doc = params |> RJson.get("textDocument");
       let%try uri = RJson.get("uri", doc) |?> RJson.string;
-      let%try version = RJson.get("version", doc) |?> RJson.number;
       let%try changes = RJson.get("contentChanges", params) |?> RJson.array;
       let%try text =
         List.nth(changes, List.length(changes) - 1)
         |> RJson.get("text")
         |?> RJson.string;
       /* Hmm how do I know if it's modified? */
-      let state = State.updateContents(uri, text, version, state);
+      let state = State.updateContents(uri, text, state);
       Ok(state);
     },
   ),

src/rescript-editor-support/State.re

@@ -47,12 +47,8 @@ let docsForCmt = (~moduleName, cmt, src, state) =>
     };
   };
 
-let updateContents = (uri, text, version, state) => {
-  Hashtbl.replace(
-    state.documentText,
-    uri,
-    (text, int_of_float(version), false),
-  );
+let updateContents = (uri, text, state) => {
+  Hashtbl.replace(state.documentText, uri, text);
   state;
 };
 

src/rescript-editor-support/TopTypes.re

@@ -18,7 +18,7 @@ type package = {
 
 type state = {
   rootUri: uri,
-  documentText: Hashtbl.t(uri, (string, int, bool)),
+  documentText: Hashtbl.t(uri, string),
   packagesByRoot: Hashtbl.t(string, package),
   rootForUri: Hashtbl.t(uri, string),
   cmtCache: Hashtbl.t(filePath, (float, SharedTypes.file)),