Skip to content

Commit 74fd653

Browse files
authored
Merge pull request #8661 from thurka/remove_vscode
VSCode extension removed from netbeans repo and moved to netbeans-vscode
2 parents 4240428 + daf175d commit 74fd653

File tree

203 files changed

+3
-22732
lines changed

Some content is hidden

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

203 files changed

+3
-22732
lines changed

.github/release.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ changelog:
100100
labels:
101101
- 'LSP'
102102

103-
- title: 'VSCode Extension'
104-
labels:
105-
- 'VSCode Extension'
106-
107103
- title: 'Maintenance'
108104
labels:
109105
- 'Code cleanup'

.github/workflows/main.yml

Lines changed: 2 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ env:
110110
# 'GraalVM' label for tests requirering GraalVM
111111
test_graalvm: ${{ contains(github.event.pull_request.labels.*.name, 'GraalVM') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
112112

113-
# 'VSCode Extension' label for building and testing the VSCode Extension
114-
test_vscode_extension: ${{ contains(github.event.pull_request.labels.*.name, 'VSCode Extension') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
115-
116113
# 'Ant', 'Gradle', 'Maven' and 'MX' labels trigger the build-tools job
117114
test_build_tools: ${{ contains(github.event.pull_request.labels.*.name, 'Ant') || contains(github.event.pull_request.labels.*.name, 'Gradle') || contains(github.event.pull_request.labels.*.name, 'Maven') || contains(github.event.pull_request.labels.*.name, 'MX') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
118115

@@ -469,8 +466,8 @@ jobs:
469466
470467
build-from-src-zip:
471468
name: Build ${{ matrix.config }} from src.zip on JDK ${{ matrix.java }}
472-
# equals env.test_platform == 'true' || test_vscode_extension == 'true'
473-
if: ${{ contains(github.event.pull_request.labels.*.name, 'Platform') || contains(github.event.pull_request.labels.*.name, 'VSCode Extension') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
469+
# equals env.test_platform == 'true'
470+
if: ${{ contains(github.event.pull_request.labels.*.name, 'Platform') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
474471
needs: base-build
475472
runs-on: ubuntu-latest
476473
timeout-minutes: 60
@@ -515,20 +512,6 @@ jobs:
515512
cd tmpbuild
516513
ant $OPTS -quiet build -Dcluster.config=${{ matrix.config }}
517514
518-
# extra round for VSCodeExt which is built with 'release' config
519-
- name: Set up node
520-
if: ${{ (matrix.config == 'release') && success() }}
521-
uses: actions/setup-node@v4
522-
with:
523-
node-version: 20.18.1
524-
525-
- name: Build NBVSCodeExt from ${{ matrix.config }}-src zip
526-
if: ${{ (matrix.config == 'release') && success() }}
527-
run: |
528-
cd tmpbuild/java/java.lsp.server
529-
ant $OPTS build-vscode-ext -D3rdparty.modules=.*externalcodeformatter.*
530-
531-
532515
ide-modules-test:
533516
name: IDE Modules on Linux/JDK ${{ matrix.java }}
534517
needs: base-build
@@ -2604,55 +2587,6 @@ jobs:
26042587
with:
26052588
paths: "./*/*/build/test/*/results/TEST-*.xml"
26062589

2607-
2608-
vscode-extension-test:
2609-
name: VSCode Extension Tests on JDK ${{ matrix.java }}
2610-
# equals env.test_vscode_extension == 'true'
2611-
if: ${{ contains(github.event.pull_request.labels.*.name, 'VSCode Extension') || contains(github.event.pull_request.labels.*.name, 'ci:all-tests') || github.event_name != 'pull_request' }}
2612-
needs: base-build
2613-
runs-on: ubuntu-latest
2614-
timeout-minutes: 60
2615-
strategy:
2616-
matrix:
2617-
java: [ '17' ]
2618-
fail-fast: false
2619-
2620-
steps:
2621-
- name: Set up JDK ${{ matrix.java }}
2622-
uses: actions/setup-java@v4
2623-
with:
2624-
java-version: ${{ matrix.java }}
2625-
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
2626-
2627-
- name: Set up node
2628-
uses: actions/setup-node@v4
2629-
with:
2630-
node-version: 20.18.1
2631-
2632-
- name: Setup Xvfb
2633-
run: |
2634-
echo "DISPLAY=:99.0" >> $GITHUB_ENV
2635-
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
2636-
2637-
- name: Download Build
2638-
uses: actions/download-artifact@v5
2639-
with:
2640-
name: build
2641-
2642-
- name: Extract
2643-
run: tar --zstd -xf build.tar.zst
2644-
2645-
- name: build-vscode-ext
2646-
run: |
2647-
cd java/java.lsp.server
2648-
ant $OPTS build-vscode-ext -D3rdparty.modules=.*externalcodeformatter.*
2649-
2650-
- name: test-vscode-ext
2651-
run: |
2652-
cd java/java.lsp.server
2653-
env "netbeans.extra.options=-J-Dnetbeans.logger.console=true" ant $OPTS test-vscode-ext
2654-
2655-
26562590
# cleanup job depends on everything so that it is forced to run last even if a long job fails early.
26572591
# 'paperwork' is left out intentionally, since it doesn't run unit tests (hopefully doesn't need restarts)
26582592
# and shouldn't prevent cleanup on validation failure - which might be common during dev time
@@ -2681,7 +2615,6 @@ jobs:
26812615
- lsp-test
26822616
- mysql-db-test
26832617
- graalvm-test
2684-
- vscode-extension-test
26852618

26862619
# cleanup if the primary build job succeeded and
26872620
# * nothing else failed (allows manual restarts)

icons.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ <h1>NetBeans Bitmap and SVG Icons</h1>
8282
<tr><td><img src='ide/xml/src/org/netbeans/modules/xml/wizard/impl/folder_closed.png'><td>16x16<td>ide/xml/src/org/netbeans/modules/xml/wizard/impl/folder_closed.png</tr>
8383
<tr><td><img src='java/jshell.support/src/org/netbeans/modules/jshell/resources/folder.png'><td>16x13<td>java/jshell.support/src/org/netbeans/modules/jshell/resources/folder.png</tr>
8484
<tr><td><img src='profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/folder.png'><td>16x16<td>profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/folder.png</tr>
85-
<tr><td><img src='java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.closedIcon.png'><td>16x16<td>java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.closedIcon.png</tr>
86-
<tr><td><td><td>java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.leafIcon.png</tr>
8785
<tr><td><img src='ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/resources/category.png'><td>16x16<td>ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/resources/category.png</tr>
8886
<tr><td><img src='platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/resources/win-explorer-folder.gif'><td>16x16<td>platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/resources/win-explorer-folder.gif</tr>
8987
<tr><td><img src='platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/resources/xp-explorer-folder.gif'><td>16x16<td>platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/resources/xp-explorer-folder.gif</tr>
@@ -111,7 +109,6 @@ <h1>NetBeans Bitmap and SVG Icons</h1>
111109
<tr style='background: #eee'><td><img src='ide/projectui/src/org/netbeans/modules/project/ui/resources/open.gif'><td>16x16<td>ide/projectui/src/org/netbeans/modules/project/ui/resources/open.gif</tr>
112110
<tr style='background: #eee'><td><img src='platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/resources/win-explorer-opened-folder.gif'><td>16x16<td>platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/resources/win-explorer-opened-folder.gif</tr>
113111
<tr style='background: #eee'><td><img src='platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/resources/vista_folder.png'><td>16x16<td>platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/resources/vista_folder.png</tr>
114-
<tr style='background: #eee'><td><img src='java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.openIcon.png'><td>16x16<td>java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/uidefaults/Tree.openIcon.png</tr>
115112
<tr style='background: #eee'><td><img src='enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/resources/expand.gif'><td>16x16<td>enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/resources/expand.gif</tr>
116113
<tr><td rowspan='19'><span style="color: #00000000">^</span>arrowDown<td rowspan='19'><img src='profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/down.svg'><td><img src='profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/down.png'><td>16x16<td>profiler/profiler/src/org/netbeans/modules/profiler/impl/icons/down.png</tr>
117114
<tr><td><img src='contrib/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/down.gif'><td>16x16<td>contrib/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/down.gif</tr>
@@ -1167,7 +1164,6 @@ <h1>NetBeans Bitmap and SVG Icons</h1>
11671164
<tr><td rowspan='1'><span style="color: #00000000">^</span>mavenNBM<td rowspan='1'><img src='apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/nbmicon.svg'><td><img src='apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/nbmicon.png'><td>16x16<td>apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/nbmicon.png</tr>
11681165
<tr style='background: #eee'><td rowspan='1'><span style="color: #00000000">^</span>mavenSuite<td rowspan='1'><img src='apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/suiteicon.svg'><td><img src='apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/suiteicon.png'><td>16x16<td>apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/suiteicon.png</tr>
11691166
<tr><td rowspan='1'><span style="color: #00000000">^</span>mavenRepoBrowser<td rowspan='1'><img src='java/maven.repository/src/org/netbeans/modules/maven/repository/MavenRepoBrowser.svg'><td><img src='java/maven.repository/src/org/netbeans/modules/maven/repository/MavenRepoBrowser.png'><td>16x16<td>java/maven.repository/src/org/netbeans/modules/maven/repository/MavenRepoBrowser.png</tr>
1170-
<tr style='background: #eee'><td rowspan='3'><span style="color: #00000000">^</span>javaMaven<td rowspan='3'><img src='java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/jaricon.svg'><td><img src='java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/jaricon.png'><td>16x16<td>java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/jaricon.png</tr>
11711167
<tr style='background: #eee'><td><td><td>java/maven/src/org/netbeans/modules/maven/resources/jaricon.png</tr>
11721168
<tr style='background: #eee'><td><td><td>javafx/javafx2.kit/src/org/netbeans/modules/javafx2/kit/resources/jaricon.png</tr>
11731169
<tr><td rowspan='1'><span style="color: #00000000">^</span>mavenWeb<td rowspan='1'><img src='enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/resources/WebIcon.svg'><td><img src='enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/resources/WebIcon.png'><td>16x16<td>enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ui/resources/WebIcon.png</tr>
@@ -2454,7 +2450,6 @@ <h1>NetBeans Bitmap and SVG Icons</h1>
24542450
<tr><td><img src='ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/color.gif'><td>16x16<td>ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/color.gif</tr>
24552451
<tr><td><td><td>platform/print/src/org/netbeans/modules/print/util/image/color.gif</tr>
24562452
<tr><td><img src='ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/empty.png'><td>16x16<td>ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/empty.png</tr>
2457-
<tr><td><td><td>java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/resources/empty.png</tr>
24582453
<tr><td><img src='ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/reference.png'><td>16x16<td>ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/reference.png</tr>
24592454
<tr><td><td><td>java/java.source/src/org/netbeans/modules/java/source/resources/icons/uses.png</tr>
24602455
<tr><td><img src='ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/value.png'><td>16x16<td>ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/icons/value.png</tr>
@@ -3119,7 +3114,6 @@ <h1>NetBeans Bitmap and SVG Icons</h1>
31193114
<tr><td><img src='java/refactoring.java/src/org/netbeans/modules/refactoring/java/resources/down.png'><td>20x16<td>java/refactoring.java/src/org/netbeans/modules/refactoring/java/resources/down.png</tr>
31203115
<tr><td><img src='ide/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20-disabled.png'><td>20x19<td>ide/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20-disabled.png</tr>
31213116
<tr><td><img src='ide/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20.png'><td>20x19<td>ide/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20.png</tr>
3122-
<tr><td><img src='java/java.lsp.server/vscode/images/run.png'><td>20x19<td>java/java.lsp.server/vscode/images/run.png</tr>
31233117
<tr><td><img src='ide/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20-disabled.png'><td>20x20<td>ide/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20-disabled.png</tr>
31243118
<tr><td><img src='ide/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20.png'><td>20x20<td>ide/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20.png</tr>
31253119
<tr><td><img src='ide/css.editor/src/org/netbeans/modules/css/resources/icons/ie20-disabled.png'><td>20x20<td>ide/css.editor/src/org/netbeans/modules/css/resources/icons/ie20-disabled.png</tr>

0 commit comments

Comments
 (0)