Use up-to-date libraries

maxencelaurent · Sep 25, 2021 · 2003fe6 · 2003fe6
1 parent a20bda9
commit 2003fe6
Show file tree

Hide file tree

Showing 14 changed files with 124 additions and 89 deletions.
diff --git a/build.xml b/build.xml
@@ -7,7 +7,7 @@
     <import file="nbproject/build-impl.xml"/>
 
     <!-- Path to the TypeScript installation to use. -->
-    <property name="typescript" value="${env.HOME}/TypeScript-2.9.1"/>
+    <property name="typescript" value="${env.HOME}/usr/typescript"/>
 
     <target name="compile-ts-services-check" depends="basic-init">
         <uptodate property="compile-ts-services.uptodate" targetfile="${cluster}/nbts-services.js">

diff --git a/manifest.mf b/manifest.mf
@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: true
 OpenIDE-Module: netbeanstypescript
 OpenIDE-Module-Layer: netbeanstypescript/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: netbeanstypescript/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.0.1
+OpenIDE-Module-Specification-Version: 3.0.2
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=c7dc402d
 build.xml.stylesheet.CRC32=a56c6a5b@2.67.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=b67624fe
+nbproject/build-impl.xml.data.CRC32=ac5ff7dd
 nbproject/build-impl.xml.script.CRC32=8b04660f
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1
+nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.85
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -1,4 +1,15 @@
-javac.source=1.7
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVA=netbeans-formatter
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVASCRIPT=netbeans-formatter
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JSON=netbeans-formatter
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_XML=netbeans-formatter
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.enableIndentationSettings=true
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSize=false
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSizeValue=4
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.showNotifications=false
+auxiliary.de-funfried-netbeans-plugins-externalcodeformatter.useProjectSettings=false
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
+javac.source=11
 javac.compilerargs=-Xlint -Xlint:-serial
 extra.module.files=nbts-services.js
+javadoc.arch=${basedir}/arch.xml
 license.file=LICENSES.txt
diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.24.1</specification-version>
+                        <specification-version>1.41</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.38.1</specification-version>
+                        <specification-version>1.61</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.40.1</specification-version>
+                        <specification-version>1.57</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -39,7 +39,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>0.9.1</specification-version>
+                        <specification-version>0.25</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -48,7 +48,16 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.47.1.2.1.1.8</specification-version>
+                        <specification-version>2.69.0.2.1.1.8.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.csl.types</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.13</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -57,7 +66,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.34.1.43</specification-version>
+                        <specification-version>1.52.0.55</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -66,7 +75,15 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.38.1.1</specification-version>
+                        <specification-version>1.56.0.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.22.0.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -75,7 +92,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>1.37.1</specification-version>
+                        <specification-version>1.56</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -84,7 +101,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>3</release-version>
-                        <specification-version>3.49.1.22.43</specification-version>
+                        <specification-version>4.20.0.23.3.55</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -93,7 +110,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.85.1.43</specification-version>
+                        <specification-version>2.33.0.55.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -102,7 +119,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.36.1</specification-version>
+                        <specification-version>1.53</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -111,7 +128,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.58.1</specification-version>
+                        <specification-version>1.78</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -120,7 +137,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>1.59.1.1</specification-version>
+                        <specification-version>1.76.0.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -129,95 +146,103 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.78.3.8</specification-version>
+                        <specification-version>9.20.0.8</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.refactoring.api</code-name-base>
+                    <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.40.1.1</specification-version>
+                        <specification-version>9.22.0.1.3.8</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.actions</code-name-base>
+                    <code-name-base>org.netbeans.modules.refactoring.api</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.35.1</specification-version>
+                        <specification-version>1.60.0.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.62.1</specification-version>
+                        <specification-version>7.81</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.dialogs</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.38.1</specification-version>
+                        <specification-version>7.55</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>8.12.1</specification-version>
+                        <specification-version>9.25</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.modules</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.43.1</specification-version>
+                        <specification-version>7.61</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.nodes</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.39.1</specification-version>
+                        <specification-version>7.58</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.text</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.62.2</specification-version>
+                        <specification-version>6.81</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>8.39.1</specification-version>
+                        <specification-version>9.21</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.util.lookup</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>8.25.1</specification-version>
+                        <specification-version>8.47</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.ui</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>9.21</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
                     <code-name-base>org.openide.windows</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.71.1</specification-version>
+                        <specification-version>6.90</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>

diff --git a/server/main.ts b/server/main.ts
@@ -194,7 +194,7 @@ class Program {
     }
     getCompletionEntryDetails(fileName: string, position: number, entryName: string) {
         if (! this.fileInProject(fileName)) return null;
-        return this.service.getCompletionEntryDetails(fileName, position, entryName, void 0, void 0, void 0);
+        return this.service.getCompletionEntryDetails(fileName, position, entryName, undefined, undefined, undefined, undefined);
     }
     getCompletionEntryLocation(fileName: string, position: number, entryName: string) {
         if (! this.fileInProject(fileName)) return null;

diff --git a/src/netbeanstypescript/CompileAction.java b/src/netbeanstypescript/CompileAction.java
@@ -50,7 +50,6 @@
 import javax.swing.AbstractAction;
 import org.json.simple.JSONObject;
 import org.netbeans.api.progress.ProgressHandle;
-import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.modules.parsing.api.ParserManager;
 import org.netbeans.modules.parsing.api.ResultIterator;
 import org.netbeans.modules.parsing.api.Source;
@@ -61,7 +60,7 @@
 import org.openide.filesystems.FileUtil;
 import org.openide.util.Exceptions;
 import org.openide.util.RequestProcessor;
-import org.openide.util.Utilities;
+import org.openide.util.Lookup;
 
 /**
  *
@@ -76,11 +75,11 @@ public CompileAction() {
     @Override
     public void actionPerformed(ActionEvent e) {
         final Collection<? extends FileObject> fileObjects =
-                Utilities.actionsGlobalContext().lookupAll(FileObject.class);
+                Lookup.getDefault().lookupAll(FileObject.class);
         class CompileTask extends UserTask implements Runnable {
             @Override
             public void run() {
-                ProgressHandle progress = ProgressHandleFactory.createHandle("TypeScript compile");
+                ProgressHandle progress = ProgressHandle.createHandle("TypeScript compile");
                 progress.start();
                 try {
                     List<Source> sources = new ArrayList<>(fileObjects.size());