Filtering supported files

codemakerai · Jun 14, 2024 · 595aea0 · 595aea0
1 parent 500614d
commit 595aea0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/assistant/command.ts b/src/assistant/command.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import CodemakerService from '../service/codemakerService';
-import { langFromFileExtension, isFileSupported } from '../utils/languageUtils';
+import { isFileSupported } from '../utils/languageUtils';
 import { Configuration } from '../configuration/configuration';
 
 enum CommandType {

diff --git a/src/completion/completionProvider.ts b/src/completion/completionProvider.ts
@@ -2,7 +2,7 @@
 
 import * as vscode from 'vscode';
 import CodemakerService from '../service/codemakerService';
-import { langFromFileExtension } from '../utils/languageUtils';
+import { languageFromFile } from '../utils/languageUtils';
 import { isEndOfLine } from '../utils/editorUtils';
 import { Configuration } from '../configuration/configuration';
 import { CodemakerStatusbar, StatusBarStatus } from '../vscode/statusBar';
@@ -57,7 +57,7 @@ export default class CompletionProvider implements vscode.InlineCompletionItemPr
                 var output = await this.service.complete(
                     document.uri,
                     document.getText(), 
-                    langFromFileExtension(document.fileName), 
+                    languageFromFile(document.fileName), 
                     offset - 1, 
                     Configuration.isAllowMultiLineAutocomplete(), 
                     codeSnippetContexts,

diff --git a/src/service/codemakerService.ts b/src/service/codemakerService.ts
@@ -6,7 +6,7 @@ import * as fs from 'node:fs';
 import { TextDecoder, TextEncoder } from 'util';
 import { Client, ProcessRequest, CompletionRequest, PredictRequest, Language, Mode, Modify, DiscoverContextRequest, CreateContextRequest, RegisterContextRequest, SourceContext, DiscoverContextResponse, AssistantCodeCompletionRequest, AssistantCompletionRequest, AssistantCodeCompletionResponse, AssistantCompletionResponse } from 'codemaker-sdk';
 import { Configuration } from '../configuration/configuration';
-import { langFromFileExtension } from '../utils/languageUtils';
+import { languageFromFile, isFileSupported } from '../utils/languageUtils';
 import { CodeSnippetContext } from 'codemaker-sdk';
 import { ClientManager } from '../client/clientManager';
 
@@ -110,7 +110,7 @@ class CodemakerService {
     public async assistantCodeCompletion(message: string, path: vscode.Uri) {
         const model = Configuration.model();
 
-        const language = langFromFileExtension(path.path);
+        const language = languageFromFile(path.path);
         const source = await this.readFile(path);
 
         const contextId = await this.registerContext(language, path);
@@ -164,7 +164,7 @@ class CodemakerService {
     private getPredictiveProcessor() {
         return async (filePath: vscode.Uri): Promise<void> => {       
             const model = Configuration.model();     
-            const lang = langFromFileExtension(filePath.path);
+            const lang = languageFromFile(filePath.path);
 
             const contextId = await this.registerContext(lang, filePath);
 
@@ -177,7 +177,7 @@ class CodemakerService {
     private getFileProcessor(mode: Mode, depth: number = 0, modify: Modify = Modify.none, codePath?: string, prompt?: string) {
         return async (filePath: vscode.Uri): Promise<void> => {     
             const model = Configuration.model();
-            const lang = langFromFileExtension(filePath.path);
+            const lang = languageFromFile(filePath.path);
 
             const contextId = await this.registerContext(lang, filePath);
 
@@ -192,7 +192,7 @@ class CodemakerService {
     private getSourceGraphFileProcessor(mode: Mode, depth: number = 0) {
         return async (filePath: vscode.Uri): Promise<void> => {
             const model = Configuration.model();
-            const lang = langFromFileExtension(filePath.path);
+            const lang = languageFromFile(filePath.path);
 
             if (depth < CodemakerService.maximumSourceGraphDepth) {
                 const discoverContextResponse = await this.discoverContext(filePath, lang);
@@ -220,12 +220,12 @@ class CodemakerService {
             return await processor(root);
         }
         for (const [name, type] of await vscode.workspace.fs.readDirectory(root)) {
-            if (type === vscode.FileType.File) {
-                await processor(vscode.Uri.joinPath(root, name));
-            } else if (type === vscode.FileType.Directory) {
+            if (type === vscode.FileType.Directory) {
                 await this.walkFiles(vscode.Uri.joinPath(root, name), processor);
+            } else if (type === vscode.FileType.File && isFileSupported(name)) {
+                await processor(vscode.Uri.joinPath(root, name));
             } else {
-                console.error('Unsupported file type');
+                console.error(`File ${name} is not supported`);
             }
         }
     }

diff --git a/src/utils/languageUtils.ts b/src/utils/languageUtils.ts
@@ -24,7 +24,7 @@ export function isFileSupported(fileName: string): boolean {
     return !!ext && languages.has(ext);
 }
 
-export function langFromFileExtension(fileName: string): Language {
+export function languageFromFile(fileName: string): Language {
     const ext = fileName.split('.').pop();
     if (!ext) {
         throw new UnsupportedLanguageError("Could not determine file language " + fileName);