Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@saranshsaini
saranshsaini committed Jan 30, 2025
1 parent c6d1841 commit 14d40d4
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 50 deletions.
101 changes: 52 additions & 49 deletions CodeiumVS/LanguageServer/LanguageServer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using CodeiumVS.Packets;
using Community.VisualStudio.Toolkit;
using EnvDTE;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.Imaging;
Expand All @@ -21,6 +22,7 @@
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Controls;
using System.Xml.Linq;

namespace CodeiumVS;
Expand Down Expand Up @@ -745,17 +747,27 @@ private async Task InitializeTrackedWorkspaceAsync()
await _package.LogAsync($"Number of top-level projects: {dte.Solution.Projects.Count}");

var documents = dte.Documents;
var openFilePaths = new HashSet<string>();
// var openFilePaths = new HashSet<string>();
var openFileProjects = new HashSet<EnvDTE.Project>();
if (_package.SettingsPage.IndexOpenFiles)
{
foreach (EnvDTE.Document doc in documents)
{
await _package.LogAsync($"Open File: {doc.Path}");
openFilePaths.Add(doc.Path);
ProjectItem projectItem = doc.ProjectItem;
await _package.LogAsync($"projectITEM: {projectItem}");
if (projectItem != null)
{
EnvDTE.Project project = projectItem.ContainingProject;
if (project != null && !openFileProjects.Contains(project))
{
openFileProjects.Add(project);
await _package.LogAsync($"Open File FOUNDD: {project}, {project.FullName}, {project.Name}");
}
}
}
}

var inputFilesToIndex = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
var inputDirectoriesToIndex = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
string projectListPath = _package.SettingsPage.IndexingFilesListPath.Trim();
try
{
Expand All @@ -770,21 +782,21 @@ private async Task InitializeTrackedWorkspaceAsync()
{
if (Path.IsPathRooted(trimmedLine))
{
inputFilesToIndex.Add(trimmedLine);
inputDirectoriesToIndex.Add(trimmedLine);
}
}
}
await _package.LogAsync($"Loaded from {inputFilesToIndex.Count} files");
await _package.LogAsync($"Loaded from {inputDirectoriesToIndex.Count} directories");
}
}
catch (Exception ex)
{
await _package.LogAsync($"Error reading project list: {ex.Message}");
}

List<string> projectsToIndex = new List<string>(inputFilesToIndex);
List<string> projectsToIndex = new List<string>(inputDirectoriesToIndex);
int maxToIndex = 10;
projectsToIndex.AddRange(await GetFilesToIndex(inputFilesToIndex, openFilePaths, maxToIndex - projectsToIndex.Count, dte));
projectsToIndex.AddRange(await GetDirectoriesToIndex(inputDirectoriesToIndex, openFileProjects, maxToIndex - projectsToIndex.Count, dte));
await _package.LogAsync($"Number of projects to index: {projectsToIndex.Count}");

for (int i = 0; i < Math.Min(maxToIndex, projectsToIndex.Count); i++)
Expand All @@ -805,28 +817,22 @@ private async Task InitializeTrackedWorkspaceAsync()
}
}

private async Task<List<string>> GetFilesToIndex(HashSet<string> processedProjects, HashSet<string> openFilePaths, int remainingToFind, DTE dte)
private async Task<List<string>> GetDirectoriesToIndex(HashSet<string> processedProjects, HashSet<EnvDTE.Project> openFileProjects, int remainingToFind, DTE dte)
{
await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
HashSet<string> openFilesProjectsToIndexPath = new HashSet<string>();
HashSet<string> remainingProjectsToIndexPath = new HashSet<string>();
// Safeguard against any edge case
int maxRecursiveCalls = 25;
async Task AddFilesToIndexLists(EnvDTE.Project project)
{
maxRecursiveCalls--;
if (remainingToFind <= 0 || (openFilePaths.Count == 0 && remainingProjectsToIndexPath.Count >= remainingToFind) || maxRecursiveCalls == 0)
if (remainingToFind <= 0)
{
return;
}
string projectFullName = project.FullName;
string projectName = Path.GetFileNameWithoutExtension(projectFullName);
IEnumerable<string> commonDirs;
IEnumerable<string> commonDirs = Enumerable.Empty<string>();

if (!string.IsNullOrEmpty(projectFullName) && !processedProjects.Any(p => projectFullName.StartsWith(p)))
{
string projectDir = Path.GetDirectoryName(projectFullName);
string projectCommonRoot = projectDir;

// Parse the csproj file to find all source directories
if (File.Exists(projectFullName) && (projectFullName.EndsWith(".csproj", StringComparison.OrdinalIgnoreCase) || projectFullName.EndsWith(".vcxproj", StringComparison.OrdinalIgnoreCase)))
{
Expand Down Expand Up @@ -858,42 +864,22 @@ async Task AddFilesToIndexLists(EnvDTE.Project project)
fullPaths.Add(fullPath);
}

commonDirs = FileUtilities.FindMinimumEncompassingDirectories(fullPaths);
commonDirs = Utilities.FileUtilities.FindMinimumEncompassingDirectories(fullPaths);
}
catch (Exception ex)
{
await _package.LogAsync($"Failed to parse project file {projectFullName}: {ex.Message}");
}
}

if (openFilePaths.Count != 0)
{
List<string> matchingFiles = new List<string>();
foreach (var filePath in openFilePaths)
{
var matchingDir = commonDirs.FirstOrDefault(dir => filePath.StartsWith(dir, StringComparison.OrdinalIgnoreCase));
if (matchingDir != null)
{
await _package.LogAsync($"Found in open files {filePath}, {matchingDir}");
openFilesProjectsToIndexPath.Add(matchingDir);
matchingFiles.Add(filePath);
}
}
if (matchingFiles.Any())
{
remainingToFind--;
openFilePaths.ExceptWith(matchingFiles);
}
}
else
await _package.LogAsync($"Found set-covering directories for {projectName}: {commonDirs.Count()}");
foreach (var dir in commonDirs)
{
await _package.LogAsync($"Found in remaining {commondDirs.Count}");
foreach (var dir in commonDirs)
{
remainingProjectsToIndexPath.Add(dir);
}
remainingToFind -= 1;
remainingProjectsToIndexPath.Add(dir);
}
processedProjects.Add(projectFullName);

processedProjects.Add(project.Name);
}

foreach (EnvDTE.ProjectItem item in project.ProjectItems)
Expand All @@ -913,8 +899,24 @@ async Task AddFilesToIndexLists(EnvDTE.Project project)
}
}

foreach (EnvDTE.Project project in openFileProjects)
{
try
{
await AddFilesToIndexLists(project);
}
catch (Exception ex)
{
await _package.LogAsync($"Failed to process project: {ex.Message}");
continue;
}
}
foreach (EnvDTE.Project project in dte.Solution.Projects)
{
if (openFileProjects.Contains(project))
{
continue;
}
try
{
await AddFilesToIndexLists(project);
Expand All @@ -924,11 +926,12 @@ async Task AddFilesToIndexLists(EnvDTE.Project project)
await _package.LogAsync($"Failed to process project: {ex.Message}");
continue;
}
if (remainingToFind <=0)
{
break;
}
}
List<string> result = new List<string>();
result.AddRange(openFilesProjectsToIndexPath);
result.AddRange(remainingProjectsToIndexPath);
return result;
return remainingProjectsToIndexPath.ToList();
}


Expand Down
2 changes: 1 addition & 1 deletion CodeiumVS/source.extension.vsixmanifest
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="Codeium.VisualStudio" Version="1.8.98" Language="en-US" Publisher="Codeium" />
<Identity Id="Codeium.VisualStudio" Version="1.8.99" Language="en-US" Publisher="Codeium" />
<DisplayName>Codeium</DisplayName>
<Description xml:space="preserve">The modern coding superpower: free AI code acceleration plugin for your favorite languages. Type less. Code more. Ship faster.</Description>
<MoreInfo>https://www.codeium.com</MoreInfo>
Expand Down

0 comments on commit 14d40d4

Please sign in to comment.