Skip to content

Commit 36153c6

Browse files
Add nf-lang module from language-server (#5876)
--------- Signed-off-by: Ben Sherman <[email protected]> Signed-off-by: Paolo Di Tommaso <[email protected]> Co-authored-by: Paolo Di Tommaso <[email protected]>
1 parent 47a0cc1 commit 36153c6

File tree

155 files changed

+20812
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+20812
-10
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
# DOCUMENTATION -------------------------------------------------------
22
# Docs folder ownership
33
/docs/ @nextflow-io/docs
4+
5+
# COMPILER ------------------------------------------------------------
6+
# nf-lang module
7+
/modules/nf-lang/ @nextflow-io/lang

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ clean:
5252
# install compiled artifacts in Maven local dir
5353
#
5454
install:
55-
BUILD_PACK=1 ./gradlew installLauncher publishToMavenLocal -Dmaven.repo.local=${HOME}/.nextflow/capsule/deps/
55+
BUILD_PACK=1 ./gradlew installLauncher publishToMavenLocal
5656

5757
#
5858
# Show dependencies try `make deps config=runtime`, `make deps config=google`

build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ allprojects {
8585
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
8686
maven { url = "https://s3-eu-west-1.amazonaws.com/maven.seqera.io/releases" }
8787
maven { url = "https://s3-eu-west-1.amazonaws.com/maven.seqera.io/snapshots" }
88-
maven {
89-
url 'https://jitpack.io'
90-
content { includeGroup 'com.github.nextflow-io.language-server' }
91-
}
9288
}
9389

9490
configurations {
@@ -241,7 +237,7 @@ task compile {
241237

242238
def getRuntimeConfigs() {
243239
def names = subprojects
244-
.findAll { prj -> prj.name in ['nextflow','nf-commons','nf-httpfs'] }
240+
.findAll { prj -> prj.name in ['nextflow','nf-commons','nf-httpfs','nf-lang'] }
245241
.collect { it.name }
246242

247243
FileCollection result = null
@@ -267,7 +263,7 @@ task exportClasspath {
267263
def home = System.getProperty('user.home')
268264
def all = getRuntimeConfigs()
269265
def libs = all.collect { File file -> /*println file.canonicalPath.replace(home, '$HOME');*/ file.canonicalPath; }
270-
['nextflow','nf-commons','nf-httpfs'].each {libs << file("modules/$it/build/libs/${it}-${version}.jar").canonicalPath }
266+
['nextflow','nf-commons','nf-httpfs','nf-lang'].each {libs << file("modules/$it/build/libs/${it}-${version}.jar").canonicalPath }
271267
file('.launch.classpath').text = libs.unique().join(':')
272268
}
273269
}
@@ -280,7 +276,7 @@ ext.nexusEmail = project.findProperty('nexusEmail')
280276
// `signing.keyId` property needs to be defined in the `gradle.properties` file
281277
ext.enableSignArchives = project.findProperty('signing.keyId')
282278

283-
ext.coreProjects = projects( ':nextflow', ':nf-commons', ':nf-httpfs' )
279+
ext.coreProjects = projects( ':nextflow', ':nf-commons', ':nf-httpfs', ':nf-lang' )
284280

285281
configure(coreProjects) {
286282
group = 'io.nextflow'

modules/nextflow/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ compileGroovy {
2020
dependencies {
2121
api(project(':nf-commons'))
2222
api(project(':nf-httpfs'))
23-
api 'com.github.nextflow-io.language-server:compiler:main-SNAPSHOT'
23+
api(project(':nf-lang'))
2424
api "org.apache.groovy:groovy:4.0.26"
2525
api "org.apache.groovy:groovy-nio:4.0.26"
2626
api "org.apache.groovy:groovy-xml:4.0.26"

modules/nextflow/src/main/groovy/nextflow/script/parser/v2/ScriptToGroovyVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
5555
import org.codehaus.groovy.syntax.SyntaxException;
5656

57-
import static nextflow.script.ast.ASTHelpers.*;
57+
import static nextflow.script.ast.ASTUtils.*;
5858
import static org.codehaus.groovy.ast.tools.GeneralUtils.*;
5959

6060
/**

modules/nf-lang/build.gradle

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2025, Seqera Labs
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
plugins {
17+
id 'antlr'
18+
}
19+
20+
dependencies {
21+
antlr 'org.antlr:antlr4:4.9.2'
22+
api 'org.apache.groovy:groovy:4.0.26'
23+
api 'org.pf4j:pf4j:3.12.0'
24+
25+
testImplementation ('net.bytebuddy:byte-buddy:1.14.17')
26+
testImplementation ('org.spockframework:spock-core:2.3-groovy-4.0') { exclude group: 'org.apache.groovy' }
27+
}
28+
29+
generateGrammarSource {
30+
arguments += ['-no-listener', '-no-visitor']
31+
}
32+
33+
tasks.named('sourcesJar') {
34+
dependsOn tasks.named('generateGrammarSource')
35+
}

0 commit comments

Comments
 (0)