Merge pull request #36 from mathworks/dklilley-release-1.2.0

MATLAB language server - v1.2.0

Author: dklilley

.eslintrc

@@ -18,6 +18,9 @@
         "@typescript-eslint"
     ],
     "rules": {
+        "@typescript-eslint/semi": "off",
+        "@typescript-eslint/no-inferrable-types": "off",
+        "@typescript-eslint/promise-function-async": "off",
         "@typescript-eslint/indent": ["error", 4, {
             "SwitchCase": 1,
             "VariableDeclarator": 1,

README.md

@@ -25,6 +25,16 @@ MATLAB language server supports these editors by installing the corresponding ex
 
 ### Unreleased
 
+### 1.2.0
+Release date: 2024-03-05
+
+Added:
+* Code execution support
+
+Fixed:
+* Prevent responses from MATLAB being intercepted by the incorrect request callback
+* Fixed linting diagnostic suppression with MATLAB R2024a 
+
 ### 1.1.8
 Release date: 2024-01-16
 

matlab/+matlabls/+handlers/CompletionSupportHandler.m

@@ -2,7 +2,7 @@
     % COMPLETIONSUPPORTHANDLER The feature handler for tab completion and function
     % signature support.
 
-    % Copyright 2022 - 2023 The MathWorks, Inc.
+    % Copyright 2022 - 2024 The MathWorks, Inc.
 
     properties (Access = private)
         RequestChannel = "/matlabls/completions/request"
@@ -29,7 +29,8 @@ function handleCompletionRequest (this, msg)
             completionResultsStr = matlabls.internal.getCompletionsData(code, fileName, cursorPosition);
             filteredResults = this.filterCompletionResults(completionResultsStr);
 
-            message.publish(this.ResponseChannel, filteredResults)
+            responseChannel = strcat(this.ResponseChannel, '/', msg.channelId);
+            this.CommManager.publish(responseChannel, filteredResults)
         end
 
         function compResultsStruct = filterCompletionResults (this, completionResultsStr)

matlab/+matlabls/+handlers/FormatSupportHandler.m

@@ -2,7 +2,7 @@
     % FORMATSUPPORTHANDLER The feature handler for the "Format Document" feature.
     % In the future, this may be expanded to include the "Format Selection" feature as well.
 
-    % Copyright 2022 - 2023 The MathWorks, Inc.
+    % Copyright 2022 - 2024 The MathWorks, Inc.
 
     properties (Access = private)
         RequestChannel = "/matlabls/formatDocument/request"
@@ -32,7 +32,8 @@ function handleFormatRequest (this, msg)
             response.data = indentcode(codeToFormat, 'matlab'); % This will pull from the user's MATLAB® settings.
 
             % Send formatted code
-            this.CommManager.publish(this.ResponseChannel, response)
+            responseChannel = strcat(this.ResponseChannel, '/', msg.channelId);
+            this.CommManager.publish(responseChannel, response)
         end
     end
 end

matlab/+matlabls/+handlers/IndexingHandler.m

@@ -2,14 +2,14 @@
     % INDEXINGHANDLER The feature handler for indexing documents for variable,
     % function, and class references and definitions.
 
-    % Copyright 2022 - 2023 The MathWorks, Inc.
+    % Copyright 2022 - 2024 The MathWorks, Inc.
 
     properties (Access = private)
         DocumentIndexingRequestChannel = '/matlabls/indexDocument/request'
-        DocumentIndexingResponseChannel = '/matlabls/indexDocument/response/' % Needs to be appended with requestId
+        DocumentIndexingResponseChannel = '/matlabls/indexDocument/response'
 
         FolderIndexingRequestChannel = '/matlabls/indexFolders/request'
-        FolderIndexingResponseChannel = '/matlabls/indexFolders/response/' % Needs to be appended with requestId
+        FolderIndexingResponseChannel = '/matlabls/indexFolders/response'
     end
 
     methods
@@ -26,22 +26,20 @@ function handleDocumentIndexRequest (this, msg)
 
             code = msg.code;
             filePath = msg.filePath;
-            requestId = num2str(msg.requestId);
 
             codeData = matlabls.internal.computeCodeData(code, filePath);
 
-            responseChannel = strcat(this.DocumentIndexingResponseChannel, requestId);
+            responseChannel = strcat(this.DocumentIndexingResponseChannel, '/', msg.channelId);
             this.CommManager.publish(responseChannel, codeData)
         end
 
         function handleFolderIndexRequest (this, msg)
             % Indexes M-files the provided folders
 
             folders = msg.folders;
-            requestId = num2str(msg.requestId);
 
             files = this.getAllMFilesToIndex(folders);
-            this.parseFiles(requestId, files)
+            this.parseFiles(msg.channelId, files)
         end
 
         function filesToIndex = getAllMFilesToIndex (~, folders)
@@ -127,7 +125,7 @@ function parseFile (this, requestId, filePath, isLastFile)
                 msg.isDone = false;
             end
 
-            responseChannel = strcat(this.FolderIndexingResponseChannel, requestId);
+            responseChannel = strcat(this.FolderIndexingResponseChannel, '/', requestId);
             this.CommManager.publish(responseChannel, msg);
         end
     end

matlab/+matlabls/+handlers/LintingSupportHandler.m

@@ -1,7 +1,7 @@
 classdef (Hidden) LintingSupportHandler < matlabls.handlers.FeatureHandler
     % LINTINGSUPPORTHANDLER The feature handler for linting MATLAB® code.
 
-    % Copyright 2022 - 2023 The MathWorks, Inc.
+    % Copyright 2022 - 2024 The MathWorks, Inc.
 
     properties (Access = private)
         LintingRequestChannel = '/matlabls/linting/request'
@@ -30,7 +30,8 @@ function handleLintingRequest (this, msg)
             response.lintData = split(deblank(response.lintData), newline);
             response.lintData(cellfun(@isempty, response.lintData)) = [];
 
-            this.CommManager.publish(this.LintingResponseChannel, response)
+            responseChannel = strcat(this.LintingResponseChannel, '/', msg.channelId);
+            this.CommManager.publish(responseChannel, response)
         end
 
         function handleDiagnosticSuppressionRequest (this, msg)
@@ -47,7 +48,8 @@ function handleDiagnosticSuppressionRequest (this, msg)
 
             response.suppressionEdits = matlabls.internal.getDiagnosticSuppressionEdits(code, diagnosticId, diagnosticLine);
 
-            this.CommManager.publish(this.SuppressDiagnosticResponseChannel, response);
+            responseChannel = strcat(this.SuppressDiagnosticResponseChannel, '/', msg.channelId);
+            this.CommManager.publish(responseChannel, response);
         end
     end
 end

matlab/+matlabls/+handlers/NavigationSupportHandler.m

@@ -46,7 +46,8 @@ function handleResolvePathRequest (this, msg)
                 cd(returnDir);
             end
 
-            this.CommManager.publish(this.ResolvePathResponseChannel, response);
+            responseChannel = strcat(this.ResolvePathResponseChannel, '/', msg.channelId);
+            this.CommManager.publish(responseChannel, response);
         end
     end
 end

matlab/+matlabls/+internal/computeCodeData.p

@@ -11,7 +11,12 @@ function initmatlabls (outFile)
     fprintf("matlabls: matlabroot is \n%s\n", matlabroot)
 
     % Ensure the language server code is on the path
-    addpath(fileparts(mfilename("fullpath")))
+    folder = fileparts(mfilename("fullpath"));
+    addpath(folder)
+
+    if isMATLABReleaseOlderThan('R2023a')
+        addpath(fullfile(folder, 'shadows', 'clc'));
+    end
 
     % Create matlabls helper for calculating language server operations
     persistent matlablsHelper %#ok<PUSE>