Merge pull request #38 from mathworks/dklilley-release-1.2.1

MATLAB language server - v1.2.1

Author: dklilley

README.md

@@ -25,6 +25,15 @@ MATLAB language server supports these editors by installing the corresponding ex
 
 ### Unreleased
 
+### 1.2.1
+Release date: 2024-04-04
+
+Added:
+* Supports connecting to MATLAB when the New Desktop for MATLAB is enabled
+
+Fixed:
+* Fixed launching App Designer and Simulink through MATLAB code execution
+
 ### 1.2.0
 Release date: 2024-03-05
 

matlab/+matlabls/+handlers/CompletionSupportHandler.m

@@ -12,9 +12,8 @@
     end
 
     methods
-        function this = CompletionSupportHandler (commManager)
-            this = [email protected](commManager);
-            this.RequestSubscriptions = this.CommManager.subscribe(this.RequestChannel, @this.handleCompletionRequest);
+        function this = CompletionSupportHandler ()
+            this.RequestSubscriptions = matlabls.internal.CommunicationManager.subscribe(this.RequestChannel, @this.handleCompletionRequest);
         end
     end
 
@@ -30,7 +29,7 @@ function handleCompletionRequest (this, msg)
             filteredResults = this.filterCompletionResults(completionResultsStr);
 
             responseChannel = strcat(this.ResponseChannel, '/', msg.channelId);
-            this.CommManager.publish(responseChannel, filteredResults)
+            matlabls.internal.CommunicationManager.publish(responseChannel, filteredResults)
         end
 
         function compResultsStruct = filterCompletionResults (this, completionResultsStr)

matlab/+matlabls/+handlers/FeatureHandler.m

@@ -1,20 +1,15 @@
 classdef (Hidden) FeatureHandler < matlab.mixin.Heterogeneous & handle
     %FEATUREHANDLER Serves as the base class for all feature handlers.
 
-    % Copyright 2022 - 2023 The MathWorks, Inc.
+    % Copyright 2022 - 2024 The MathWorks, Inc.
 
     properties
-        CommManager (1,1) matlabls.internal.CommunicationManager
         RequestSubscriptions (1,:) uint64 % Holds references to subscriptions
     end
 
     methods
-        function this = FeatureHandler (commManager)
-            this.CommManager = commManager;
-        end
-
         function close (this)
-            arrayfun(@(subRef) this.CommManager.unsubscribe(subRef), this.RequestSubscriptions)
+            arrayfun(@(subRef) matlabls.internal.CommunicationManager.unsubscribe(subRef), this.RequestSubscriptions)
         end
 
         function destroy (this)

matlab/+matlabls/+handlers/FormatSupportHandler.m

@@ -10,9 +10,8 @@
     end
 
     methods
-        function this = FormatSupportHandler (commManager)
-            this = [email protected](commManager);
-            this.RequestSubscriptions = this.CommManager.subscribe(this.RequestChannel, @this.handleFormatRequest);
+        function this = FormatSupportHandler ()
+            this.RequestSubscriptions = matlabls.internal.CommunicationManager.subscribe(this.RequestChannel, @this.handleFormatRequest);
         end
     end
 
@@ -33,7 +32,7 @@ function handleFormatRequest (this, msg)
 
             % Send formatted code
             responseChannel = strcat(this.ResponseChannel, '/', msg.channelId);
-            this.CommManager.publish(responseChannel, response)
+            matlabls.internal.CommunicationManager.publish(responseChannel, response)
         end
     end
 end

matlab/+matlabls/+handlers/IndexingHandler.m

@@ -13,10 +13,9 @@
     end
 
     methods
-        function this = IndexingHandler (commManager)
-            this = [email protected](commManager);
-            this.RequestSubscriptions(end + 1) = this.CommManager.subscribe(this.DocumentIndexingRequestChannel, @this.handleDocumentIndexRequest);
-            this.RequestSubscriptions(end + 1) = this.CommManager.subscribe(this.FolderIndexingRequestChannel, @this.handleFolderIndexRequest);
+        function this = IndexingHandler ()
+            this.RequestSubscriptions(end + 1) = matlabls.internal.CommunicationManager.subscribe(this.DocumentIndexingRequestChannel, @this.handleDocumentIndexRequest);
+            this.RequestSubscriptions(end + 1) = matlabls.internal.CommunicationManager.subscribe(this.FolderIndexingRequestChannel, @this.handleFolderIndexRequest);
         end
     end
 
@@ -30,7 +29,7 @@ function handleDocumentIndexRequest (this, msg)
             codeData = matlabls.internal.computeCodeData(code, filePath);
 
             responseChannel = strcat(this.DocumentIndexingResponseChannel, '/', msg.channelId);
-            this.CommManager.publish(responseChannel, codeData)
+            matlabls.internal.CommunicationManager.publish(responseChannel, codeData)
         end
 
         function handleFolderIndexRequest (this, msg)
@@ -126,7 +125,7 @@ function parseFile (this, requestId, filePath, isLastFile)
             end
 
             responseChannel = strcat(this.FolderIndexingResponseChannel, '/', requestId);
-            this.CommManager.publish(responseChannel, msg);
+            matlabls.internal.CommunicationManager.publish(responseChannel, msg);
         end
     end
 end

matlab/+matlabls/+handlers/LintingSupportHandler.m

@@ -12,10 +12,9 @@
     end
 
     methods
-        function this = LintingSupportHandler (commManager)
-            this = [email protected](commManager);
-            this.RequestSubscriptions(1) = this.CommManager.subscribe(this.LintingRequestChannel, @this.handleLintingRequest);
-            this.RequestSubscriptions(2) = this.CommManager.subscribe(this.SuppressDiagnosticRequestChannel, @this.handleDiagnosticSuppressionRequest);
+        function this = LintingSupportHandler ()
+            this.RequestSubscriptions(1) = matlabls.internal.CommunicationManager.subscribe(this.LintingRequestChannel, @this.handleLintingRequest);
+            this.RequestSubscriptions(2) = matlabls.internal.CommunicationManager.subscribe(this.SuppressDiagnosticRequestChannel, @this.handleDiagnosticSuppressionRequest);
         end
     end
 
@@ -31,7 +30,7 @@ function handleLintingRequest (this, msg)
             response.lintData(cellfun(@isempty, response.lintData)) = [];
 
             responseChannel = strcat(this.LintingResponseChannel, '/', msg.channelId);
-            this.CommManager.publish(responseChannel, response)
+            matlabls.internal.CommunicationManager.publish(responseChannel, response)
         end
 
         function handleDiagnosticSuppressionRequest (this, msg)
@@ -49,7 +48,7 @@ function handleDiagnosticSuppressionRequest (this, msg)
             response.suppressionEdits = matlabls.internal.getDiagnosticSuppressionEdits(code, diagnosticId, diagnosticLine);
 
             responseChannel = strcat(this.SuppressDiagnosticResponseChannel, '/', msg.channelId);
-            this.CommManager.publish(responseChannel, response);
+            matlabls.internal.CommunicationManager.publish(responseChannel, response);
         end
     end
 end

matlab/+matlabls/+handlers/NavigationSupportHandler.m

@@ -9,9 +9,8 @@
     end
 
     methods
-        function this = NavigationSupportHandler (commManager)
-            this = [email protected](commManager);
-            this.RequestSubscriptions = this.CommManager.subscribe(this.ResolvePathRequestChannel, @this.handleResolvePathRequest);
+        function this = NavigationSupportHandler ()
+            this.RequestSubscriptions = matlabls.internal.CommunicationManager.subscribe(this.ResolvePathRequestChannel, @this.handleResolvePathRequest);
         end
     end
 
@@ -47,7 +46,7 @@ function handleResolvePathRequest (this, msg)
             end
 
             responseChannel = strcat(this.ResolvePathResponseChannel, '/', msg.channelId);
-            this.CommManager.publish(responseChannel, response);
+            matlabls.internal.CommunicationManager.publish(responseChannel, response);
         end
     end
 end

matlab/+matlabls/+internal/CommunicationManager.p

@@ -2,16 +2,15 @@
     % MATLABLANGUAGESERVERHELPER Class for managing the MATLAB®-side operations
     % which support the MATLAB Language Server.
 
-    % Copyright 2022 - 2023 The MathWorks, Inc.
+    % Copyright 2022 - 2024 The MathWorks, Inc.
 
     properties
-        CommManager (1,1) matlabls.internal.CommunicationManager
         FeatureHandlers (1,:) matlabls.handlers.FeatureHandler
     end
 
     methods
         function this = MatlabLanguageServerHelper ()
-            this.CommManager = matlabls.internal.CommunicationManager();
+            matlabls.internal.CommunicationManager.initialize();
             this.initializeFeatureHandlers()
         end
 
@@ -27,11 +26,11 @@ function delete (this)
     methods (Access = private)
         function initializeFeatureHandlers (this)
             % Initialize all supported feature handlers
-            this.FeatureHandlers(end + 1) = matlabls.handlers.CompletionSupportHandler(this.CommManager);
-            this.FeatureHandlers(end + 1) = matlabls.handlers.FormatSupportHandler(this.CommManager);
-            this.FeatureHandlers(end + 1) = matlabls.handlers.IndexingHandler(this.CommManager);
-            this.FeatureHandlers(end + 1) = matlabls.handlers.LintingSupportHandler(this.CommManager);
-            this.FeatureHandlers(end + 1) = matlabls.handlers.NavigationSupportHandler(this.CommManager);
+            this.FeatureHandlers(end + 1) = matlabls.handlers.CompletionSupportHandler();
+            this.FeatureHandlers(end + 1) = matlabls.handlers.FormatSupportHandler();
+            this.FeatureHandlers(end + 1) = matlabls.handlers.IndexingHandler();
+            this.FeatureHandlers(end + 1) = matlabls.handlers.LintingSupportHandler();
+            this.FeatureHandlers(end + 1) = matlabls.handlers.NavigationSupportHandler();
         end
     end
 end

matlab/+matlabls/MatlabLanguageServerHelper.m

@@ -30,15 +30,32 @@ function initmatlabls (outFile)
 end
 
 function logConnectionData (outFile)
-    c.matlabPid = feature("getpid");
-    c.matlabRelease = ['R' version('-release')];
-    c.sessionKey = dduxinternal.getSessionKey();
+    releaseInfo = matlabRelease;
 
-    connectionData = jsonencode(c);
+    data.pid = feature("getpid");
+    data.release = releaseInfo.Release;
+    data.port = matlabls.internal.CommunicationManager.getSecurePort();
+    data.certFile = matlabls.internal.CommunicationManager.getCertificateLocation();
+    data.sessionKey = dduxinternal.getSessionKey();
+
+    connectionData = jsonencode(data);
 
     disp(strcat("Printing connection data to file: ", newline, "    ", outFile))
 
-    f = fopen(outFile, "w");
-    fprintf(f, "%s\n", connectionData);
-    fclose(f);
+    % Write data to a temporary file first, then move to the expected filename to
+    % avoid a timing issue where partial data may be read from the Node.js layer.
+    tmpFileName = strcat(outFile, '-tmp');
+
+    fid = fopen(tmpFileName, "w");
+    if (fid == -1)
+        error("Failed to create temporary connection file.")
+    end
+
+    fprintf(fid, "%s\n", connectionData);
+    fclose(fid);
+
+    status = movefile(tmpFileName, outFile);
+    if ~status
+        error("Failed to rename connection file.")
+    end
 end