diff --git a/src/api/local/deployTools.ts b/src/api/local/deployTools.ts index 09c2891c5..be356d536 100644 --- a/src/api/local/deployTools.ts +++ b/src/api/local/deployTools.ts @@ -2,10 +2,9 @@ import createIgnore, { Ignore } from 'ignore'; import path, { basename } from 'path'; import vscode, { Uri, WorkspaceFolder } from 'vscode'; import { instance } from '../../instantiate'; -import { LocalLanguageActions } from './LocalLanguageActions'; import { DeploymentMethod, DeploymentParameters } from '../../typings'; -import { ConnectionConfiguration } from '../Configuration'; import { Tools } from '../Tools'; +import { LocalLanguageActions } from './LocalLanguageActions'; import { Deployment } from './deployment'; type ServerFileChanges = {uploads: Uri[], relativeRemoteDeletes: string[]}; @@ -337,13 +336,18 @@ export namespace DeployTools { export async function getDefaultIgnoreRules(workspaceFolder: vscode.WorkspaceFolder): Promise { const ignoreRules = createIgnore({ ignorecase: true }).add(`.git`); - // get the .gitignore file from workspace - const gitignores = await vscode.workspace.findFiles(new vscode.RelativePattern(workspaceFolder, `.gitignore`), ``, 1); - if (gitignores.length > 0) { + // get the .deployignore file or .gitignore file from workspace with priority to .deployignore + const ignoreFile = [ + ...await vscode.workspace.findFiles(new vscode.RelativePattern(workspaceFolder, `.deployignore`), ``, 1), + ...await vscode.workspace.findFiles(new vscode.RelativePattern(workspaceFolder, `.gitignore`), ``, 1) + ].at(0); + + if (ignoreFile) { // get the content from the file - const gitignoreContent = (await vscode.workspace.fs.readFile(gitignores[0])).toString().replace(new RegExp(`\\\r`, `g`), ``); + const gitignoreContent = (await vscode.workspace.fs.readFile(ignoreFile)).toString().replace(new RegExp(`\\\r`, `g`), ``); ignoreRules.add(gitignoreContent.split(`\n`)); ignoreRules.add('**/.gitignore'); + ignoreRules.add('**/.deployignore'); } return ignoreRules; diff --git a/src/views/ifsBrowser.ts b/src/views/ifsBrowser.ts index 74e7c5bd0..02245704c 100644 --- a/src/views/ifsBrowser.ts +++ b/src/views/ifsBrowser.ts @@ -15,7 +15,7 @@ import { BrowserItem, BrowserItemParameters, FocusOptions, IFSFile, IFS_BROWSER_ const URI_LIST_MIMETYPE = "text/uri-list"; const URI_LIST_SEPARATOR = "\r\n"; const PROTECTED_DIRS = /^(\/|\/QOpenSys|\/QSYS\.LIB|\/QDLS|\/QOPT|\/QNTC|\/QFileSvr\.400|\/bin|\/dev|\/home|\/tmp|\/usr|\/var)$/i; -const ALWAYS_SHOW_FILES = /^(\.gitignore|\.vscode)$/i; +const ALWAYS_SHOW_FILES = /^(\.gitignore|\.vscode|\.deployignore)$/i; type DragNDropAction = "move" | "copy"; type DragNDropBehavior = DragNDropAction | "ask"; const getDragDropBehavior = () => GlobalConfiguration.get(`IfsBrowser.DragAndDropDefaultBehavior`) || "ask";