Improve importing logic (#950)

Author: isc-bsaviano

src/commands/compile.ts

@@ -99,7 +99,7 @@ async function importFile(file: CurrentFile, ignoreConflict?: boolean): Promise<
       checkChangedOnServer(file, true);
     })
     .catch((error) => {
-      if (error.statusCode == 409) {
+      if (error?.statusCode == 409) {
         return vscode.window
           .showErrorMessage(
             `Failed to import '${file.name}': The version of the file on the server is newer.

src/extension.ts

@@ -626,8 +626,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       }
     } else if (file.uri.scheme === "file") {
       if (isImportableLocalFile(file)) {
-        // This local file is in the exported file tree, so it's a non-InterSystems file that's
-        // part of a CSP application, so import it on save
+        // This local file is part of a CSP application
+        // or matches our export settings, so import it on save
         return importFileOrFolder(file.uri, true);
       }
     }

src/utils/index.ts

@@ -130,7 +130,8 @@ export function isImportableLocalFile(file: vscode.TextDocument): boolean {
           return true;
         }
       } else {
-        return true;
+        // Non-CSP or DFI files cannot be in subdirectories
+        return !filePath.includes(path.sep);
       }
     }
     return false;