(netbeans) branch master updated: Github actions version bumps.
This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 049eda8415 Github actions version bumps.
new bf8131cc09 Merge pull request #6850 from mbien/ci-action-updates
049eda8415 is described below
commit 049eda8415bf79a9d5d2f5d1d89336d676c81598
Author: Michael Bien
AuthorDate: Fri Dec 15 10:19:14 2023 +0100
Github actions version bumps.
- upload/download action v3 to v4
- setup-java action v3 to v4
upload/download actions got some usability improvements
- artifacts will now be available for dl right after the job finishes
- release claims upload/download speed improvements
- compression level is configurable, I set it to 0 for big, already
compressed artifacts
---
.github/workflows/main.yml | 122 +++--
.../native-binary-build-dlight.nativeexecution.yml | 22 ++--
.github/workflows/native-binary-build-launcher.yml | 14 +--
.../workflows/native-binary-build-lib.profiler.yml | 22 ++--
4 files changed, 91 insertions(+), 89 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a5ebea6e3a..6b4ffd3b56 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -114,7 +114,7 @@ jobs:
steps:
- name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v3
+uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: ${{ env.default_java_distribution }}
@@ -142,10 +142,11 @@ jobs:
- name: Upload Workspace
if: ${{ (matrix.java == '11') && success() }}
-uses: actions/upload-artifact@v3
+uses: actions/upload-artifact@v4
with:
name: build
path: /tmp/build.tar.zst
+ compression-level: 0
retention-days: 2
if-no-files-found: error
@@ -155,10 +156,11 @@ jobs:
- name: Upload Dev Build
if: ${{ matrix.java == '11' &&
contains(github.event.pull_request.labels.*.name, 'ci:dev-build') && success()
}}
-uses: actions/upload-artifact@v3
+uses: actions/upload-artifact@v4
with:
name: dev-build
path: nbbuild/NetBeans-*.zip
+ compression-level: 0
retention-days: 7
if-no-files-found: error
@@ -177,7 +179,7 @@ jobs:
show-progress: false
- name: Set up JDK 11
-uses: actions/setup-java@v3
+uses: actions/setup-java@v4
with:
distribution: ${{ env.default_java_distribution }}
java-version: 11
@@ -215,7 +217,7 @@ jobs:
steps:
- name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v3
+uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: ${{ env.default_java_distribution }}
@@ -227,7 +229,7 @@ jobs:
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
- name: Download Build
-uses: actions/download-artifact@v3
+uses: actions/download-artifact@v4
with:
name: build
@@ -275,7 +277,7 @@ jobs:
steps:
- name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v3
+uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: ${{ env.default_java_distribution }}
@@ -308,7 +310,7 @@ jobs:
- name: Download Build
if: ${{ needs.base-build.result == 'success' && !cancelled() }}
-uses: actions/download-artifact@v3
+uses: actions/download-artifact@v4
with:
name: build
@@ -340,13 +342,13 @@ jobs:
steps:
- name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v3
+uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: ${{ env.default_java_distribution }}
- name: Download Build
-uses: actions/download-artifact@v3
+uses: actions/download-artifact@v4
with:
name: build
@@ -373,13 +375,13 @@ jobs:
steps:
- name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v3
+uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: ${{ env.default_java_distribution }}
- name: Download Build
-uses: actions/download-artifact@v3
+uses: actions/download-artifact@v4
with:
name: build
@@ -408,13 +410,13 @@ jobs:
steps:
- name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v3
+uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
(netbeans) branch master updated: Fix the problem that inccorect indentation is added after an attribute(e.g. `#[Attr(1, 2)]`)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e941825dec Fix the problem that inccorect indentation is added after
an attribute(e.g. `#[Attr(1, 2)]`)
new cf2cfda11d Merge pull request #6940 from
junichi11/php-attribute-new-line-indent
e941825dec is described below
commit e941825dec55682523b248763a0b3eb95e6a39cd
Author: Junichi Yamamoto
AuthorDate: Wed Jan 10 15:25:42 2024 +0900
Fix the problem that inccorect indentation is added after an attribute(e.g.
`#[Attr(1, 2)]`)
Example:
```php
#[Attr1(1, 2)]
#[Attr2("test", "test")]^ // type enter key here
class AttributedClass {
#[Attr1(1, 2)]
#[Attr2("test", "test")]^ // type enter key here
public function method(): void {
}
}
```
Before:
```php
#[Attr1(1, 2)]
#[Attr2("test", "test")]
^// incorrect indent
class AttributedClass {
#[Attr1(1, 2)]
#[Attr2("test", "test")]
^// incorrect indent
public function method(): void {
}
}
```
After:
```php
#[Attr1(1, 2)]
#[Attr2("test", "test")]
^// correct indent
class AttributedClass {
#[Attr1(1, 2)]
#[Attr2("test", "test")]
^// correct indent
public function method(): void {
}
}
```
---
.../php/editor/indent/IndentationCounter.java | 5 ++--
.../testfiles/indent/php80/attributeSyntax_09.php | 21 ++
.../indent/php80/attributeSyntax_09.php.indented | 22 +++
.../testfiles/indent/php80/attributeSyntax_10.php | 21 ++
.../indent/php80/attributeSyntax_10.php.indented | 22 +++
.../testfiles/indent/php80/attributeSyntax_11.php | 21 ++
.../indent/php80/attributeSyntax_11.php.indented | 22 +++
.../testfiles/indent/php80/attributeSyntax_12.php | 21 ++
.../indent/php80/attributeSyntax_12.php.indented | 22 +++
.../testfiles/indent/php80/attributeSyntax_13.php | 21 ++
.../indent/php80/attributeSyntax_13.php.indented | 22 +++
.../testfiles/indent/php80/attributeSyntax_14.php | 22 +++
.../indent/php80/attributeSyntax_14.php.indented | 23
.../testfiles/indent/php80/attributeSyntax_15.php | 25 +
.../indent/php80/attributeSyntax_15.php.indented | 26 ++
.../testfiles/indent/php80/attributeSyntax_16.php | 29
.../indent/php80/attributeSyntax_16.php.indented | 30
.../php/editor/indent/PHPNewLineIndenterTest.java | 32 ++
18 files changed, 405 insertions(+), 2 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/indent/IndentationCounter.java
b/php/php.editor/src/org/netbeans/modules/php/editor/indent/IndentationCounter.java
index 2b11dea818..18295da010 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/indent/IndentationCounter.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/indent/IndentationCounter.java
@@ -766,8 +766,9 @@ public class IndentationCounter {
}
}
if (result) {
-// check whether there is tokens other than whitespace for
parameters, anonymous function/class
-int lineStart = LineDocumentUtils.getLineStart(doc,
LineDocumentUtils.getLineStart(doc, ts.offset()) - 1);
+// check for non-whitespace tokens before an attribute of
parameters, anonymous function/class
+// not `ts.offset() - 1` but `ts.offset()` to avoid getting the
start position of the previous line
+int lineStart = LineDocumentUtils.getLineStart(doc,
LineDocumentUtils.getLineStart(doc, ts.offset()));
while (ts.movePrevious() && ts.offset() >= lineStart) {
if (ts.token().id() != PHPTokenId.WHITESPACE) {
result = false;
diff --git
a/php/php.editor/test/unit/data/testfiles/indent/php80/attributeSyntax_09.php
b/php/php.editor/test/unit/data/testfiles/indent/php80/attributeSyntax_09.php
new file mode 100644
index 00..e6899db128
--- /dev/null
+++
b/php/php.editor/test/unit/data/testfiles/indent/php80/attributeSyntax_09.php
@@ -0,0 +1,21 @@
+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.
+ */
+
+$closure = function(#[Attr(1, 2)]^ $param) {};
diff --git
(netbeans-jenkins-lib) branch master updated: Vote candidate 2
This is an automated email from the ASF dual-hosted git repository.
mbalin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 0d04f3c Vote candidate 2
0d04f3c is described below
commit 0d04f3cc34113f5f24f8aa1e04443a66441c8069
Author: Martin Balin
AuthorDate: Wed Jan 10 13:23:31 2024 +0100
Vote candidate 2
---
meta/netbeansrelease.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 3d7505e..2645dbc 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1176,7 +1176,7 @@
"plugin_url":
"https://netbeans.apache.org/nb/plugins/20/catalog.xml.gz;,
"publish_apidoc":"false",
"milestones": {
-"53e632e7e3068683519d985fc33f40647c3dcd8e": {
+"2fb03d6ccf775da515fd128f05d252a5e434d3eb": {
"version": "1",
"position": "1"
}
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) branch vsnetbeans_2003 updated: Work on documents, not on editors. Translate filenames on Windows
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_2003
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/vsnetbeans_2003 by this push:
new 2fb03d6ccf Work on documents, not on editors. Translate filenames on
Windows
2fb03d6ccf is described below
commit 2fb03d6ccf775da515fd128f05d252a5e434d3eb
Author: Svata Dedic
AuthorDate: Wed Jan 10 10:09:51 2024 +0100
Work on documents, not on editors. Translate filenames on Windows
---
java/java.lsp.server/vscode/src/extension.ts | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/extension.ts
b/java/java.lsp.server/vscode/src/extension.ts
index 841a95c070..d743950e54 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -1063,12 +1063,20 @@ function doActivateWithJDK(specifiedJDK: string | null,
context: ExtensionContex
runConfigurationUpdateAll();
});
c.onRequest(SaveDocumentsRequest.type, async (request :
SaveDocumentRequestParams) => {
-for (let ed of window.visibleTextEditors) {
-if
(request.documents.includes(ed.document.uri.toString())) {
-await
vscode.commands.executeCommand('workbench.action.files.save', ed.document.uri);
+const uriList = request.documents.map(s => {
+let re = /^file:\/(?:\/\/)?([A-Za-z]):\/(.*)$/.exec(s);
+if (!re) {
+return s;
+}
+// don't ask why vscode mangles URIs this way; in
addition, it uses lowercase drive letter ???
+return `file:///${re[1].toLowerCase()}%3A/${re[2]}`;
+});
+for (let ed of workspace.textDocuments) {
+if (uriList.includes(ed.uri.toString())) {
+return ed.save();
}
}
-return true;
+return false;
});
c.onRequest(InputBoxRequest.type, async param => {
return await window.showInputBox({ title: param.title, prompt:
param.prompt, value: param.value, password: param.password });
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) branch master updated: Work on documents, not on editors. Translate filenames on Windows
This is an automated email from the ASF dual-hosted git repository.
mbalin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new cec07f4604 Work on documents, not on editors. Translate filenames on
Windows
new f3e3311159 Merge pull request #6941 from sdedic/lsp/save-document-fix
cec07f4604 is described below
commit cec07f4604def0fd7227a371c50813d06d86eac8
Author: Svata Dedic
AuthorDate: Wed Jan 10 10:09:51 2024 +0100
Work on documents, not on editors. Translate filenames on Windows
---
java/java.lsp.server/vscode/src/extension.ts | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/extension.ts
b/java/java.lsp.server/vscode/src/extension.ts
index 841a95c070..d743950e54 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -1063,12 +1063,20 @@ function doActivateWithJDK(specifiedJDK: string | null,
context: ExtensionContex
runConfigurationUpdateAll();
});
c.onRequest(SaveDocumentsRequest.type, async (request :
SaveDocumentRequestParams) => {
-for (let ed of window.visibleTextEditors) {
-if
(request.documents.includes(ed.document.uri.toString())) {
-await
vscode.commands.executeCommand('workbench.action.files.save', ed.document.uri);
+const uriList = request.documents.map(s => {
+let re = /^file:\/(?:\/\/)?([A-Za-z]):\/(.*)$/.exec(s);
+if (!re) {
+return s;
+}
+// don't ask why vscode mangles URIs this way; in
addition, it uses lowercase drive letter ???
+return `file:///${re[1].toLowerCase()}%3A/${re[2]}`;
+});
+for (let ed of workspace.textDocuments) {
+if (uriList.includes(ed.uri.toString())) {
+return ed.save();
}
}
-return true;
+return false;
});
c.onRequest(InputBoxRequest.type, async param => {
return await window.showInputBox({ title: param.title, prompt:
param.prompt, value: param.value, password: param.password });
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r66530 - /dev/netbeans/netbeans-vscode-ext/20.0.301/
Author: mbalin Date: Wed Jan 10 08:23:35 2024 New Revision: 66530 Log: VSNetBeans 20.0.301 voting candidate 1 Added: dev/netbeans/netbeans-vscode-ext/20.0.301/ dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip (with props) dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip.asc dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip.sha512 dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix (with props) dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix.asc dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix.sha512 Added: dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip.asc == --- dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip.asc (added) +++ dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip.asc Wed Jan 10 08:23:35 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEE52g/vKDdQfd6FlAXIqk2+v1IbpoFAmWdmKsACgkQIqk2+v1I +bprDAA/+Jn/2q3Bq2hCIQr2+EEWfbWpqxtewkOA9Fi3NEjwcrlDshEStLSqC862P +ateARwQbrf2NmWdTMM0stvPAzScmr+k6O8F8GWt0L2LNme5Kv9rv0/vWxeC3ou/B +ar6oQB/1BhlsCjy3/+Vsa/RbAADT2xDUrHqSzXw0LJA1UX6pH93s4IgW/C92zCqd +POunbjUullcvWL3LCzQtbIr9UqHr22IibnAWB+EUWHMZAPjbIF1xb9Hj606UdDQ4 +jKoHQUJMmwVdFGCwsEnMBca8z2FbUEYfb8Bw5bCjTR9ohZp+5CtFDXGbeFm0y1Js +jdic4nSLwY43zUWN/gEMz7aVdjKSlXWaLFxg6bcVGQaR8j5QdLjXzV2LX/MB6Yve +0gevS7LbDRNEJal6PToG/6AS4aagmE6UHthqSYgRdJBg05b2L2J/47G+TB6BL55J +skOK3CMqkogD4hbPYfM8CXVeOaW5yusLIa4gKx/xfXrrm8kNaMpeGQl7Qy4hajHl +J3bAkBQijrvpHSDfWO2NhV2bEWcl3tlb8VPWR2llUgyVlHWNZGayYoZUEjd10Wk9 +J4zqkGKDxTEW+3pSAuoF6FvAM/yuUm7mVf+QdF8Dx0qpzj6UDFUsSQ12Do7A6kA9 +Etg/SlEgl6L18Y9LGZVYFM8QLfpXQ0b8iV4enAHn8RWdTylw6R8= +=hUBS +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip.sha512 == --- dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip.sha512 (added) +++ dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301-sources.zip.sha512 Wed Jan 10 08:23:35 2024 @@ -0,0 +1 @@ +31e34c31c166da074c47adbe80b91d5f9849b2433e396e05044ea7a43e838d2da07ca88b40926c66be79379da9863904dd25f4e70a17ad2e49ef81692199f11f apache-netbeans-java-20.0.301-sources.zip Added: dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix == Binary file - no diff available. Propchange: dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix.asc == --- dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix.asc (added) +++ dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix.asc Wed Jan 10 08:23:35 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEE52g/vKDdQfd6FlAXIqk2+v1IbpoFAmWdmGsACgkQIqk2+v1I +bprdhQ/8DzPzYzwLZwlE1tZoT60QOxCwmEnRVPdT+IZGQp0yT+UBvgxdhI13j6KU +F0VhR2n3hwbolbiZjwX6y88cayX5K3dfFbBC7d24GBiYk19Dhowkl76RbBgFXFkW +MqNDr6mn1Kc3KnwXnuDwHCLENpsQUwsgN7xtEXd499OmnJScMRntFc5N2/hmpFrD +gmNq4OQpxh0DgP4Ax6sK8GkCOhm2sy9vDFqYaX+F9F2uJoQ8BZHsrihbQ4ddKNqi +b+VY6H1h9M7cEdROa50kkwETQ2xZx1d5NgMf0rT5fCvptlPhM6ejVJ9tkT+k6Ad1 +zBx6sLYCY8Cwpj9Ei6bEmwzmot1NFVtChumhQkJclN7QNcM7ltSyOnH8EpY3t/5I +mmu7VpmHHtn/C+vjlfzlHcHe66WQS8hDH+HxzTfhLtSHFaolVYQoR0c1J41DKc39 +zyi4TFDLM+WS2tgFQEGrJ5LDSTR2RNUHTHPLzO1nPgsQYxUQOrEvbvYHYqCmRWHv +sYemBpWWxJN1KxOTwxlqY6dCBtqM8L1/akdcwkEQlwJ993RD/02rPHlm42W9Nbkh +Dag9DmQKMZYWa2lpSPLbml6ZDCN/NHc4DfFIu1timnOIj+bQLdQrpjWEsFu8m9Gg +bApxuEZbfUVtsJUaztKxokmcveMjy3Xgloc6P0zAT1IFeeOEXno= +=z++X +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix.sha512 == --- dev/netbeans/netbeans-vscode-ext/20.0.301/apache-netbeans-java-20.0.301.vsix.sha512 (added) +++
