Skip to content

Commit 6eb3c52

Browse files
committed
switch to use Task instead Build
1 parent 4802c7f commit 6eb3c52

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-spotless-gradle",
33
"displayName": "Spotless Gradle",
44
"description": "Format your source files using Spotless via Gradle",
5-
"version": "0.0.0",
5+
"version": "1.3.1",
66
"private": true,
77
"publisher": "richardwillis",
88
"readme": "README.md",
@@ -134,5 +134,5 @@
134134
"semver": "^7.3.5",
135135
"vscode-gradle": "^3.10.1"
136136
},
137-
"snyk": true
137+
"snyk": false
138138
}

src/Spotless.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as path from 'path';
22
import * as util from 'util';
33
import * as vscode from 'vscode';
4-
import { ExtensionApi as GradleApi, RunBuildOpts } from 'vscode-gradle';
5-
import type { Output } from 'vscode-gradle';
4+
import { ExtensionApi as GradleApi } from 'vscode-gradle';
5+
import type { Output, RunTaskOpts } from 'vscode-gradle';
66
import { logger } from './logger';
77
import { getWorkspaceFolder, sanitizePath } from './util';
88
import {
@@ -61,16 +61,15 @@ export class Spotless {
6161
}
6262
const basename = path.basename(document.uri.fsPath);
6363
const sanitizedPath = sanitizePath(document.uri.fsPath);
64+
const workspaceFolder = getWorkspaceFolder(document.uri);
65+
const cancelledDeferred = new Deferred();
66+
6467
const args = [
65-
'spotlessApply',
6668
`-PspotlessIdeHook=${sanitizedPath}`,
6769
'-PspotlessIdeHookUseStdIn',
6870
'-PspotlessIdeHookUseStdOut',
69-
'--no-configuration-cache',
7071
'--quiet',
7172
];
72-
const workspaceFolder = getWorkspaceFolder(document.uri);
73-
const cancelledDeferred = new Deferred();
7473

7574
cancellationToken?.onCancellationRequested(() =>
7675
cancelledDeferred.resolve(undefined)
@@ -79,7 +78,8 @@ export class Spotless {
7978
let stdOut = '';
8079
let stdErr = '';
8180

82-
const runBuildOpts: RunBuildOpts = {
81+
const runBuildOpts: RunTaskOpts = {
82+
taskName: 'spotlessApply',
8383
projectFolder: workspaceFolder.uri.fsPath,
8484
args,
8585
input: document.getText(),
@@ -101,7 +101,7 @@ export class Spotless {
101101

102102
logger.info(`Running spotlessApply on ${basename}`);
103103

104-
const runBuild = this.gradleApi.runBuild(runBuildOpts);
104+
const runBuild = this.gradleApi.runTask(runBuildOpts);
105105

106106
await Promise.race([runBuild, cancelledDeferred.promise]);
107107

0 commit comments

Comments
 (0)