Merge changes from main branch

Author: dklilley

matlab/+matlabls/+handlers/IndexingHandler.m

@@ -25,8 +25,9 @@ function handleDocumentIndexRequest (this, msg)
 
             code = msg.code;
             filePath = msg.filePath;
+            analysisLimit = msg.analysisLimit;
 
-            codeData = matlabls.internal.computeCodeData(code, filePath);
+            codeData = matlabls.internal.computeCodeData(code, filePath, analysisLimit);
 
             responseChannel = strcat(this.DocumentIndexingResponseChannel, '/', msg.channelId);
             matlabls.internal.CommunicationManager.publish(responseChannel, codeData)
@@ -36,9 +37,10 @@ function handleFolderIndexRequest (this, msg)
             % Indexes M-files the provided folders
 
             folders = msg.folders;
+            analysisLimit = msg.analysisLimit;
 
             files = this.getAllMFilesToIndex(folders);
-            this.parseFiles(msg.channelId, files)
+            this.parseFiles(msg.channelId, files, analysisLimit)
         end
 
         function filesToIndex = getAllMFilesToIndex (~, folders)
@@ -56,30 +58,30 @@ function handleFolderIndexRequest (this, msg)
             end
         end
 
-        function parseFiles (this, requestId, files)
+        function parseFiles (this, requestId, files, analysisLimit)
             % Processes the given list of files and sends the data back to the language server.
 
             if isMATLABReleaseOlderThan('R2021b')
                 % If backgroundPool doesn't exist, leverage a timer to avoid blocking thread
-                this.doParseFilesWithTimer(this, requestId, files);
+                this.doParseFilesWithTimer(this, requestId, files, analysisLimit);
             else
-                parfeval(backgroundPool, @this.doParseFiles, 0, requestId, files);
+                parfeval(backgroundPool, @this.doParseFiles, 0, requestId, files, analysisLimit);
             end
         end
 
-        function doParseFilesWithTimer (this, requestId, files, index)
+        function doParseFilesWithTimer (this, requestId, files, analysisLimit, index)
             % This leverages a timer to achieve an "asynchronous" looping effect, allowing
             % other operations to take place between parsing each file. This prevents the MATLAB®
             % thread from becomming blocked for an extended period of time.
 
-            if nargin == 3
+            if nargin == 4
                 index = 1;
             end
 
             filePath = files(index);
             isLastFile = index == numel(files);
 
-            this.parseFile(requestId, filePath, isLastFile);
+            this.parseFile(requestId, filePath, isLastFile, analysisLimit);
 
             if ~isLastFile
                 % More files - queue next file to parse
@@ -93,26 +95,26 @@ function timerCallback (t, ~)
                 t.delete();
 
                 % Parse next file
-                this.parseFiles(requestId, files, index + 1);
+                this.doParseFilesWithTimer(requestId, files, analysisLimit, index + 1);
             end
         end
 
-        function doParseFiles (this, requestId, files)
+        function doParseFiles (this, requestId, files, analysisLimit)
             % This can be executed in a separate thread (e.g. parfeval) to avoid blocking the
             % MATLAB thread.
 
             for n = 1:numel(files)
                 filePath = files{n};
                 isLastFile = n == numel(files);
-                this.parseFile(requestId, filePath, isLastFile);
+                this.parseFile(requestId, filePath, isLastFile, analysisLimit);
             end
         end
 
-        function parseFile (this, requestId, filePath, isLastFile)
+        function parseFile (this, requestId, filePath, isLastFile, analysisLimit)
             % Parses the given file and sends its data back to the language server
 
             code = fileread(filePath);
-            codeData = matlabls.internal.computeCodeData(code, filePath);
+            codeData = matlabls.internal.computeCodeData(code, filePath, analysisLimit);
 
             % Send data for this file
             msg.filePath = filePath;

matlab/+matlabls/+internal/computeCodeData.m

@@ -1,4 +1,4 @@
-function codeInfo = computeCodeData (code, filePath)
+function codeInfo = computeCodeData (code, filePath, analysisLimit)
     %COMPUTECODEDATA Compute sub-function location information for the
     % MATLAB® code file specified by fullpath. The data is a struct:
     %
@@ -42,8 +42,7 @@
     functionReferences = {};
 
     %% Handle very large input
-    MAXCODE = 500000;
-    if strlength(code) > MAXCODE
+    if analysisLimit > 0 && strlength(code) > analysisLimit
         % File too large - do not try to index
         code = '';
     end