Skip to content

Commit d1ac021

Browse files
committed
Apply upstream changes from nf-lang
Signed-off-by: Ben Sherman <[email protected]>
1 parent 6dd51c7 commit d1ac021

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/main/java/nextflow/lsp/ast/ASTNodeCache.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public Set<URI> update(Set<URI> uris, FileCache fileCache) {
102102

103103
// parse source files
104104
var sources = uris.parallelStream()
105-
.map(uri -> compiler.newSourceUnit(uri, fileCache))
105+
.map(uri -> compiler.createSourceUnit(uri, fileCache))
106106
.filter(sourceUnit -> sourceUnit != null)
107107
.map(sourceUnit -> {
108108
compiler.addSource(sourceUnit);

src/main/java/nextflow/lsp/compiler/LanguageServerCompiler.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,24 +50,24 @@ public LanguageServerCompiler(CompilerConfiguration configuration, GroovyClassLo
5050
*
5151
* @param uri
5252
*/
53-
public SourceUnit newSourceUnit(URI uri, FileCache fileCache) {
53+
public SourceUnit createSourceUnit(URI uri, FileCache fileCache) {
5454
if( fileCache.isOpen(uri) ) {
5555
var contents = fileCache.getContents(uri);
5656
return new SourceUnit(
5757
uri.toString(),
5858
new StringReaderSourceWithURI(contents, uri, configuration()),
5959
configuration(),
6060
classLoader(),
61-
newErrorCollector());
61+
createErrorCollector());
6262
}
6363
if( Files.exists(Path.of(uri)) ) {
64-
return super.newSourceUnit(new File(uri));
64+
return super.createSourceUnit(new File(uri));
6565
}
6666
return null;
6767
}
6868

6969
@Override
70-
protected ErrorCollector newErrorCollector() {
70+
protected ErrorCollector createErrorCollector() {
7171
return new LanguageServerErrorCollector(configuration());
7272
}
7373

src/main/java/nextflow/lsp/services/script/ScriptAstCache.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected Set<URI> analyze(Set<URI> uris, FileCache fileCache) {
9292
// recursively load included modules
9393
for( var uri : uris ) {
9494
var source = compiler().getSource(uri);
95-
new ModuleResolver(compiler()).resolve(source, (includeUri) -> compiler().newSourceUnit(includeUri, fileCache));
95+
new ModuleResolver(compiler()).resolve(source, (includeUri) -> compiler().createSourceUnit(includeUri, fileCache));
9696
}
9797

9898
// phase 2: include checking

0 commit comments

Comments
 (0)