Skip to content

Commit af697fc

Browse files
committed
refactor: move the common parts into JavaArgs function
1 parent 8515200 commit af697fc

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

lib/grammars/java.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ import path from "path"
1010
import GrammarUtils from "../grammar-utils"
1111
const { command } = GrammarUtils
1212

13-
function JavaArgs(sourcePath, filepath, className, classPackages, tempFolder) {
13+
function JavaArgs(filepath, context) {
14+
const sourcePath = GrammarUtils.Java.getProjectPath(context)
15+
const className = GrammarUtils.Java.getClassName(context)
16+
const classPackages = GrammarUtils.Java.getClassPackage(context)
17+
const tempFolder = GrammarUtils.createTempFolder("jar-")
1418
const cmd = `javac -encoding UTF-8 -sourcepath '${sourcePath}' -d '${tempFolder}' '${filepath}' && java -D'file.encoding'='UTF-8' -cp '${tempFolder}' ${classPackages}${className}`
1519
return GrammarUtils.formatArgs(cmd)
1620
}
@@ -21,21 +25,13 @@ export const Java = {
2125
args(context) {
2226
const code = context.getCode()
2327
const tmpFile = GrammarUtils.createTempFileWithCode(code, ".java")
24-
const sourcePath = GrammarUtils.Java.getProjectPath(context)
25-
const className = GrammarUtils.Java.getClassName(context)
26-
const classPackages = GrammarUtils.Java.getClassPackage(context)
27-
const tempFolder = GrammarUtils.createTempFolder("jar-")
28-
return JavaArgs(sourcePath, tmpFile, className, classPackages, tempFolder)
28+
return JavaArgs(tmpFile, context)
2929
},
3030
},
3131
"File Based": {
3232
command,
3333
args(context) {
34-
const sourcePath = GrammarUtils.Java.getProjectPath(context)
35-
const className = GrammarUtils.Java.getClassName(context)
36-
const classPackages = GrammarUtils.Java.getClassPackage(context)
37-
const tempFolder = GrammarUtils.createTempFolder("jar-")
38-
return JavaArgs(sourcePath, context.filepath, className, classPackages, tempFolder)
34+
return JavaArgs(context.filepath, context)
3935
},
4036
},
4137
}

0 commit comments

Comments
 (0)