Configuration detection fix

jdneo · Sep 24, 2019 · a420570 · a420570
1 parent 7973f83
commit a420570
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/commands/check.ts b/src/commands/check.ts
@@ -4,6 +4,7 @@
 import * as fse from 'fs-extra';
 import { Uri, window, workspace } from 'vscode';
 import { checkstyleDiagnosticManager } from '../checkstyleDiagnosticManager';
+import { findNonIgnoredFiles } from '../utils/workspaceUtils';
 
 export async function checkCode(uri?: Uri): Promise<void> {
     if (!uri) { // If not specified, check active editor
@@ -14,7 +15,7 @@ export async function checkCode(uri?: Uri): Promise<void> {
     }
     let filesToCheck: Uri[];
     if ((await fse.stat(uri.fsPath)).isDirectory()) {
-        filesToCheck = await workspace.findFiles(`${workspace.asRelativePath(uri)}/**/*.java`);
+        filesToCheck = await findNonIgnoredFiles(`${workspace.asRelativePath(uri)}/**/*.java`);
     } else {
         filesToCheck = [uri];
     }

diff --git a/src/commands/config.ts b/src/commands/config.ts
@@ -3,11 +3,13 @@
 
 import * as fse from 'fs-extra';
 import * as path from 'path';
-import { Uri, window, workspace, WorkspaceFolder } from 'vscode';
+import { Uri, window, WorkspaceFolder } from 'vscode';
 import * as xmljs from 'xml-js';
+import { checkstyleChannel } from '../checkstyleChannel';
 import { BuiltinConfiguration, checkstyleDoctypeIds } from '../constants/checkstyleConfigs';
 import { IQuickPickItemEx } from '../models';
-import { getDefaultWorkspaceFolder, setCheckstyleConfigurationPath, tryUseWorkspaceFolder } from '../utils/settingUtils';
+import { setCheckstyleConfigurationPath } from '../utils/settingUtils';
+import { findNonIgnoredFiles, getDefaultWorkspaceFolder, tryUseWorkspaceFolder } from '../utils/workspaceUtils';
 
 export async function setConfiguration(uri?: Uri): Promise<void> {
     if (uri) {
@@ -88,7 +90,7 @@ async function inputConfiguration(): Promise<string | undefined> {
 
 async function detectConfigurations(): Promise<IQuickPickItemEx[]> {
     const detected: IQuickPickItemEx[] = [];
-    for (const xml of await workspace.findFiles('**/*.xml')) {
+    for (const xml of await findNonIgnoredFiles('**/*.xml')) {
         const relativeXml: string = tryUseWorkspaceFolder(xml.fsPath);
         function doctypeFn(doctype: string): void {
             const [name, type] = doctype.split(/\s+/, 2);
@@ -103,7 +105,11 @@ async function detectConfigurations(): Promise<IQuickPickItemEx[]> {
                 }
             }
         }
-        xmljs.xml2js(await fse.readFile(xml.fsPath, 'utf8'), { doctypeFn });
+        try {
+            xmljs.xml2js(await fse.readFile(xml.fsPath, 'utf8'), { doctypeFn });
+        } catch (error) { // Skip this xml, continue detecting process
+            checkstyleChannel.appendLine(`Parse failed: ${xml}`);
+        }
     }
     return detected;
 }
diff --git a/src/constants/checkstyleConfigs.ts b/src/constants/checkstyleConfigs.ts
@@ -7,6 +7,10 @@ export enum BuiltinConfiguration {
 }
 
 export const checkstyleDoctypeIds: string[] = [
+    '-//Checkstyle//DTD Configuration 1.0//EN',
+    '-//Checkstyle//DTD Configuration 1.1//EN',
+    '-//Checkstyle//DTD Configuration 1.2//EN',
+    '-//Checkstyle//DTD Configuration 1.3//EN',
     '-//Checkstyle//DTD Checkstyle Configuration 1.0//EN',
     '-//Checkstyle//DTD Checkstyle Configuration 1.1//EN',
     '-//Checkstyle//DTD Checkstyle Configuration 1.2//EN',