Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
create-release:
needs: [ 'test' ]
runs-on: ubuntu-latest
if: ${{ github.head_ref == 'main' && github.event_name != 'pull_request_target' && github.event_name == 'pull_request'}}
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
steps:
- uses: actions/checkout@v6
with:
Expand Down
2 changes: 0 additions & 2 deletions scripts/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ initialize () {
fi

PACKAGE_VERSION=$(jq -r '.version' package.json)
log_it "PACKAGE_VERSION=$PACKAGE_VERSION"
PATCH=${PACKAGE_VERSION##*.}
log_it "PATCH_VERSION=$PATCH"
if [ "$((PATCH % 2))" = "1" ]; then
log_it "version patch component is odd. packaging as prerelease. (PATCH=$PATCH)"
PRERELEASE=true
Expand Down
2 changes: 1 addition & 1 deletion src/DebugListingPreview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export class DebugListingContentProvider implements TextDocumentContentProvider
this.debugListingUriMap.set(debugListingPreviewUri.fsPath, debugListingUri)
this.sourceUriMap.set(debugListingPreviewUri.fsPath, sourceUri)

if (!this.previewEditor || this.previewEditor.document.uri.fsPath !== debugListingPreviewUri.fsPath) {
if (this.previewEditor?.document.uri.fsPath !== debugListingPreviewUri.fsPath) {
this.previewEditor = await window.showTextDocument(debugListingPreviewUri, {
viewColumn: this.previewEditor?.viewColumn ?? ViewColumn.Beside,
preview: true,
Expand Down
2 changes: 1 addition & 1 deletion src/FileUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export function toUri (path: string | Uri, base?: string | Uri): Uri {
if (base) {
return Uri.joinPath(toUri(base), path)
}
if (workspace.workspaceFolders && workspace.workspaceFolders.length === 1) {
if (workspace.workspaceFolders?.length === 1) {
return Uri.joinPath(workspace.workspaceFolders[0].uri, path)
}
throw new Error('No basedir provided for relative path: ' + path)
Expand Down
2 changes: 1 addition & 1 deletion src/parse/OpenedgeProjectParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ function loadConfigFile (uri: Uri): IOpenEdgeMainConfig | undefined {

const cachedConfig = configMap.get(uri.fsPath)
const configModifiedTime = FileUtils.getFileModifiedTime(uri)
if (cachedConfig && cachedConfig.modifiedTime.valueOf() === configModifiedTime.valueOf()) {
if (cachedConfig?.modifiedTime.valueOf() === configModifiedTime.valueOf()) {
log.debug('found cached OpenEdge project config for ' + uri.fsPath)
return cachedConfig
}
Expand Down
2 changes: 1 addition & 1 deletion src/parse/ResultsParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export class ABLResultsParser {
errors: Number(res[idx].$.errors),
failures: Number(res[idx].$.failures),
skipped: Number(res[idx].$.skipped ?? 0),
time: Number(res[idx].$.time * 1000),
time: Number(res[idx].$.time) * 1000,
properties: this.parseProperties(res[idx].properties),
testsuite: testsuite,
testcases: testcases
Expand Down
Loading