Up-to-date with current master

.github/workflows/main.yml

@@ -152,12 +152,12 @@ jobs:
           restore-keys: ${{ runner.os }}-
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.3.1
+        uses: shivammathur/setup-php@2.8.0
         with:
           php-version: '7.4'
           tools: pecl
           extensions: xdebug
-          ini-values: xdebug.remote_enable=on
+          ini-values: xdebug.remote_enable=on, xdebug.remote_port=9003
 
       - name: Launch Xvfb
         run: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &

.gitignore

@@ -35,6 +35,7 @@
 /nbi/engine/native/*/*/dist/
 /nb-javac/
 /java.source.nbjavac/test/test-nb-javac/nbproject/private/
+/java/java.lsp.server/vscode/.vscode-test/
 /harness/apisupport.harness/windows-launcher-src/*.exe
 /harness/apisupport.harness/windows-launcher-src/*.res
 /ide/versioning/test/qa-functional/data/tck.properties
@@ -71,16 +72,20 @@ derby.log
 /ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParserTokenManager.java
 /ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/Token.java
 /ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/TokenMgrError.java
-/debugger.jpda.ui/test/qa-functional/data/debugTestProject/nbproject/private/
-/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/private/
 /profiler/lib.profiler/release/lib/
 /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/
 /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/
 /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/
+/javafx2.samples/FXML-LoginDemo/nbproject/private/
+
+# OS generated files - test related #
+#####################################
+/debugger.jpda.ui/test/qa-functional/data/debugTestProject/nbproject/private/
+/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/private/
+/platform/o.n.bootstrap/test/unit/data/jars
 /xml/test/qa-functional/data/DTDActionsTestProject/nbproject/private/
 /xml/test/qa-functional/data/ActionsTestProject/nbproject/private/
 /xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/
-/javafx2.samples/FXML-LoginDemo/nbproject/private/
 
 # Snapcraft Generated files #
 #######################

.travis.yml

@@ -305,7 +305,7 @@ matrix:
             - ant $OPTS -f ide/xml.lexer test
             - ant $OPTS -f ide/xml.multiview test
             - ant $OPTS -f ide/xml.retriever test
-            - ant $OPTS -f ide/xml.schema.completion test -Dtest.config=stableBTD
+            - ant $OPTS -f ide/xml.schema.completion test
             - ant $OPTS -f ide/xml.schema.model test
             - ant $OPTS -f ide/xml.text test
             - ant $OPTS -f ide/xml.text.obsolete90 test
@@ -748,14 +748,15 @@ matrix:
         - name: Build the Visual Studio Code extension for Java
           jdk: openjdk8
           before_install:
-            - nvm install 8
+            - nvm install 12.14.1
           env:
             - OPTS="-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json -quiet -Dcluster.config=java -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest-unit-sys-prop.ignore.random.failures=true"
           before_script:
             - ant $OPTS clean
             - ant $OPTS build
           script:
             - (cd java/java.lsp.server; ant build-vscode-ext)
+            - (cd java/java.lsp.server; ant test-vscode-ext)
 
         - name: "GraalVM Tests (latest)"
           jdk: openjdk8

apisupport/apisupport.ant/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.apisupport.ant
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.82
+OpenIDE-Module-Specification-Version: 2.83
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/resources/layer.xml

apisupport/apisupport.ant/nbproject/org-netbeans-modules-apisupport-ant.sig

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 2.81
+#Version 2.82
 
 CLSS public java.lang.Object
 cons public init()

apisupport/apisupport.installer.maven/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.apisupport.installer.maven
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/installer/maven/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
 

apisupport/apisupport.installer/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.apisupport.installer
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/installer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
 

apisupport/apisupport.installer/nbproject/org-netbeans-modules-apisupport-installer.sig

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 1.32
+#Version 1.33
 
 CLSS public abstract java.awt.Component
 cons protected init()

apisupport/apisupport.kit/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.apisupport.kit
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.40
+OpenIDE-Module-Specification-Version: 1.41
 OpenIDE-Module-Provides: org.netbeans.modules.apisupport.kit
 

apisupport/apisupport.project/manifest.mf

@@ -4,5 +4,5 @@ OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/api/Bu
 OpenIDE-Module-Requires: javax.script.ScriptEngine.freemarker
 OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/resources/layer.xml
 AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.86
+OpenIDE-Module-Specification-Version: 1.87
 

apisupport/apisupport.project/nbproject/org-netbeans-modules-apisupport-project.sig

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 1.85
+#Version 1.86
 
 CLSS public abstract java.awt.Component
 cons protected init()

apisupport/apisupport.refactoring/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.apisupport.refactoring
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/refactoring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
 

apisupport/apisupport.wizards/manifest.mf

@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.apisupport.wizards
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml
-OpenIDE-Module-Specification-Version: 1.30
+OpenIDE-Module-Specification-Version: 1.31
 

apisupport/maven.apisupport/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.maven.apisupport/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/apisupport/Bundle.properties
 AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.69
+OpenIDE-Module-Specification-Version: 1.70
 

apisupport/timers/manifest.mf

@@ -3,6 +3,6 @@ OpenIDE-Module: org.netbeans.modules.timers/1
 OpenIDE-Module-Layer: org/netbeans/modules/timers/resources/layer.xml
 OpenIDE-Module-Install: org/netbeans/modules/timers/Install.class
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/timers/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
 AutoUpdate-Show-In-Client: true
 

cpplite/cpplite.debugger/manifest.mf

@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.cpplite.debugger
 OpenIDE-Module-Layer: org/netbeans/modules/cpplite/debugger/resources/mf-layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cpplite/debugger/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 

cpplite/cpplite.debugger/nbproject/org-netbeans-modules-cpplite-debugger.sig

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 1.0
+#Version 1.1
 
 CLSS public java.lang.Object
 cons public init()

cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/breakpoints/BreakpointAnnotationListener.java

@@ -40,9 +40,8 @@
 public class BreakpointAnnotationListener extends DebuggerManagerAdapter 
 implements PropertyChangeListener {
 
-    private Map breakpointToAnnotation = new HashMap ();
-
-
+    private Map<CPPLiteBreakpoint, DebuggerBreakpointAnnotation> breakpointToAnnotation = new HashMap<>();
+
     @Override
     public String[] getProperties () {
         return new String[] {DebuggerManager.PROP_BREAKPOINTS};

cpplite/cpplite.editor/manifest.mf

@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.cpplite.editor
 OpenIDE-Module-Layer: org/netbeans/modules/cpplite/editor/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cpplite/editor/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 

cpplite/cpplite.editor/nbproject/org-netbeans-modules-cpplite-editor.sig

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 1.0
+#Version 1.1
 
 CLSS public java.lang.Object
 cons public init()
@@ -24,7 +24,9 @@ meth public abstract void removeChangeListener(javax.swing.event.ChangeListener)
 CLSS public static org.netbeans.modules.cpplite.editor.spi.CProjectConfigurationProvider$ProjectConfiguration
  outer org.netbeans.modules.cpplite.editor.spi.CProjectConfigurationProvider
 cons public init(java.lang.String)
+cons public init(java.lang.String,boolean)
 cons public init(java.util.List<java.lang.String>)
+fld public final java.lang.String commandJsonContent
 fld public final java.lang.String commandJsonPath
 fld public final java.util.List<java.lang.String> commandJsonCommand
 supr java.lang.Object

cpplite/cpplite.editor/nbproject/project.xml

@@ -25,6 +25,15 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.netbeans.modules.cpplite.editor</code-name-base>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.api.java.classpath</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.63</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.templates</code-name-base>
                     <build-prerequisite/>
@@ -66,7 +75,6 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <!--<implementation-version/>-->
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -78,6 +86,14 @@
                         <specification-version>1.52</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>9.17</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.projectapi</code-name-base>
                     <build-prerequisite/>

cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/PathRecognizerImpl.java

@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cpplite.editor;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.modules.cpplite.editor.file.MIMETypes;
+import org.netbeans.modules.parsing.spi.indexing.PathRecognizer;
+import org.openide.util.lookup.ServiceProvider;
+
+@ServiceProvider(service=PathRecognizer.class)
+public class PathRecognizerImpl extends PathRecognizer{
+
+    @Override
+    public Set<String> getSourcePathIds() {
+        return Collections.singleton(ClassPath.SOURCE);
+    }
+
+    @Override
+    public Set<String> getLibraryPathIds() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public Set<String> getBinaryLibraryPathIds() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public Set<String> getMimeTypes() {
+        return new HashSet<>(Arrays.asList(MIMETypes.C, MIMETypes.CPP, MIMETypes.H, MIMETypes.HPP));
+    }
+
+}

cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/lsp/LanguageServerImpl.java

@@ -66,7 +66,7 @@ public class LanguageServerImpl implements LanguageServerProvider {
 
     private static final Logger LOG = Logger.getLogger(LanguageServerImpl.class.getName());
 
-    private Map<Project, LanguageServerDescription> prj2Server = new HashMap<>();
+    private static final Map<Project, LanguageServerDescription> prj2Server = new HashMap<>();
 
     @Override
     public LanguageServerDescription startServer(Lookup lookup) {
@@ -117,8 +117,18 @@ public void stateChanged(ChangeEvent e) {
                             command.add("--clang-tidy");
                             command.add("--completion-style=detailed");
                         }
-                        Process process = new ProcessBuilder(command).redirectError(Redirect.INHERIT).start();
-                        return LanguageServerDescription.create(new CopyInput(process.getInputStream(), System.err), new CopyOutput(process.getOutputStream(), System.err), process);
+                        ProcessBuilder builder = new ProcessBuilder(command);
+                        if (LOG.isLoggable(Level.FINEST)) {
+                            builder.redirectError(Redirect.INHERIT);
+                        }
+                        Process process = builder.start();
+                        InputStream in = process.getInputStream();
+                        OutputStream out = process.getOutputStream();
+                        if (LOG.isLoggable(Level.FINEST)) {
+                            in = new CopyInput(in, System.err);
+                            out = new CopyOutput(out, System.err);
+                        }
+                        return LanguageServerDescription.create(in, out, process);
                     }
                     return null;
                 } catch (IOException ex) {

cpplite/cpplite.kit/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.netbeans.modules.cpplite.kit
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cpplite/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 

cpplite/cpplite.project/manifest.mf

@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.cpplite.project
 OpenIDE-Module-Layer: org/netbeans/modules/cpplite/project/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cpplite/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 

cpplite/cpplite.project/nbproject/project.xml

@@ -25,6 +25,15 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.netbeans.modules.cpplite.project</code-name-base>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.api.java.classpath</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.63</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.templates</code-name-base>
                     <build-prerequisite/>