(netbeans) branch master updated: [NETBEANS-1914] Fix startup problems on Windows after moving NetBeans install directory.
This is an automated email from the ASF dual-hosted git repository.
ebakke 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 a4807c0ec0 [NETBEANS-1914] Fix startup problems on Windows after
moving NetBeans install directory.
a4807c0ec0 is described below
commit a4807c0ec0a64ca6d5dcd0a39fde4a8fe9b50170
Author: Eirik Bakke
AuthorDate: Wed Nov 23 00:25:36 2022 -0500
[NETBEANS-1914] Fix startup problems on Windows after moving NetBeans
install directory.
On Windows, renaming or moving the NetBeans installation directory caused
errors on startup, due to references to old paths in all-layers.dat in the
cache directory. The bug did not seem to happen on Linux or MacOS; I'm not sure
why. See https://issues.apache.org/jira/browse/NETBEANS-1914 for an example
stack trace.
The solution in this patch is to include the netbeans.home path in the
all-checksum.txt file, on Windows. This will invalidate the cache if the
installation directory is changed. Some tests had to be modified to permit this
change.
---
.../startup/layers/CachingPreventsFileTouchesTest.java| 15 ---
.../modules/netbinox/CachingPreventsFileTouchesTest.java | 3 ++-
platform/o.n.bootstrap/src/org/netbeans/Stamps.java | 10 ++
.../test/unit/src/org/netbeans/StampsRenameTest.java | 7 +++
4 files changed, 31 insertions(+), 4 deletions(-)
diff --git
a/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CachingPreventsFileTouchesTest.java
b/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CachingPreventsFileTouchesTest.java
index 1df60a00d3..8470cd7977 100644
---
a/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CachingPreventsFileTouchesTest.java
+++
b/platform/core.startup/test/unit/src/org/netbeans/core/startup/layers/CachingPreventsFileTouchesTest.java
@@ -161,9 +161,18 @@ public class CachingPreventsFileTouchesTest extends
NbTestCase {
Collections.shuffle(Arrays.asList(arr));
for (File f : arr) {
if (!f.isDirectory()) {
-System.err.println("checking " + f);
-cnt++;
-assertFileDoesNotContain(f, install);
+if (f.getName().equals("all-checksum.txt")) {
+/* In org.netbeans.Stamps, we intentionally include the
full netbeans.home path
+on Windows as a workaround for NETBEANS-1914. This is
meant to invalidate the
+cache on changes to netbeans.home in case, despite the
intentions of those who
+implemented the cache directory system, an absolute path
to netbeas.home did end
+up in the cache directory. */
+System.err.println("skipping checksum file " + f);
+} else {
+System.err.println("checking " + f);
+cnt++;
+assertFileDoesNotContain(f, install);
+}
}
}
assertTrue("Some cache files found", cnt > 4);
diff --git
a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingPreventsFileTouchesTest.java
b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingPreventsFileTouchesTest.java
index f56e35c35d..1afe0a8815 100644
---
a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingPreventsFileTouchesTest.java
+++
b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingPreventsFileTouchesTest.java
@@ -238,7 +238,8 @@ public class CachingPreventsFileTouchesTest extends
NbTestCase {
final File[] arr = recursiveFiles(cacheDir, new ArrayList());
Collections.shuffle(Arrays.asList(arr));
for (File f : arr) {
-if (!f.isDirectory()) {
+// Same as in
o.n.core.startup.layers.CachingPreventsFileTouchesTest
+if (!f.isDirectory() && !f.getName().equals("all-checksum.txt")) {
cnt++;
assertFileDoesNotContain(f, install);
}
diff --git a/platform/o.n.bootstrap/src/org/netbeans/Stamps.java
b/platform/o.n.bootstrap/src/org/netbeans/Stamps.java
index f274d5d0ab..c2632cd5ca 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/Stamps.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/Stamps.java
@@ -55,6 +55,7 @@ import java.util.logging.Logger;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.openide.modules.Places;
+import org.openide.util.BaseUtilities;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
@@ -337,6 +338,15 @@ public final class Stamps {
sb.append("branding=").append(NbBundle.getBranding()).append('\n');
sb.append("java.version=").append(System.getProperty("java.version")).append('\n');
(netbeans) branch sdedic/feature/project-dependency-add_base2 updated (575448b6e1 -> 19372deb90)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git from 575448b6e1 Mangle windows URIs to vscode style. Work with documents rather than editors. add 19372deb90 Adapted to getFreshProject changes No new revisions were added by this update. Summary of changes: .../maven/queries/MavenDependenciesImplementation.java| 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) - 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 sdedic/feature/project-dependency-add_base2 updated (cd86854647 -> 575448b6e1)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git discard cd86854647 Mangle windows URIs to vscode style. Work with documents rather than editors. discard 4ebe577060 Fixed missing .complete on the returned future discard 9e854ea5e1 Missing guava breaks LSP structures toString discard 041eb1e607 Added more logging discard d0e993bbac Compensate Lsp4j bad EnumSet deserialization. discard 890730e540 Be tolerant on input casing; output enums with the exact case discard 11be2e7fc6 Fixed filtering of artifacts discard 2752f1ac0c Adding necessary test dependencies for XDM. discard 27703bdefb Add gradle.dependencies and maven.refactoring to the BuildTools testsuite discard 661a8d7df0 Paperwork: Added proper licenses instead of placeholders. discard e72a5b8ee5 LSP change dependency command added. discard d6864666dd Prototype of dependencies.find command discard 43a1407b06 Gradle + Maven implementation of project add discard 3658262985 Dependency manipulation API concept. discard 1b8c5c656b Scope redefinition, private API break. add 5f29459e3a Don't create OCI Vault secrets with empty datasource name add a9f577647c Merge pull request #6870 from apache/emptyDatasourceName add 560777b21a Fix the Overriding Methods feature add 0a6df1e093 PHP 8.3 Support: Marking overridden methods (#[\Override]) (Part 1) add fd64377bed PHP 8.3 Support: Marking overridden methods (#[\Override]) (Part 2) add af05cd8aa6 Add the `getInterfaces()` method to the `TypeDeclaration` instead of the `getInterfaes()` add 2141d37d04 Merge pull request #6873 from junichi11/php83-marking-overridden-methods add 5572ad0dc0 Prevent NullPointerException if codeAction returns null (observed on rust-analyser 0.3.1756-standalone) add c36a8ad60d LSP-Client: After server initialization is done send initialized notification to server add babcc3d5c1 Merge pull request #6856 from matthiasblaesing/lsp_improvement add 5f687eb28c Fix the formatting for the method call arguments alignment option #6714 add f4da2b4df3 Merge pull request #6877 from junichi11/php-gh-6714-formatting-for-alignment add 1cda8a74bf PHP: mark a breakpoint as broken when an error is received when breakpoint_set is executed to set a breakpoint add e8b206ef64 Merge pull request #6876 from troizet/php_mark_breakpoint_as_broken add 0737cced68 Formatting for the group multiline alignment for match arm arrows #6074 add f8055bb485 Merge pull request #6884 from junichi11/php-gh-6074-match-arm-w-arrow-alignment add 0b9c24ff09 TaskList Model issues broken table model change events add 0291513733 Merge pull request #6882 from matthiasblaesing/tasklist-tablemodel-events add 729f4dcb75 Git client: Enable forced pushes for configured push and push to upstream add 296b2bff0a Merge pull request #6823 from matthiasblaesing/git add b006691903 PHP: New way to set the current breakpoint add a34e57050b Merge pull request #6891 from troizet/php_improve_set_current_breakpoint add ea28c84d29 Update to JGit 6.8 and Bouncy Castle 1.77 add f5719ec986 Merge pull request #6887 from mbien/jgit680 add 89555d4016 Improve magic methods generation add 73b894c09a Generate `__toString()` magic method with all fields #6783 add e458d63e89 Merge pull request #6896 from junichi11/php-gh-6783-tostring-method add aa919a41f0 Add the `IncorrectStaticContextHintError` as a new hint #6703 add 7c39099393 Merge pull request #6899 from junichi11/php-gh-6703-this-in-static-context add 9189d102cf Priming build and reload improvements. add 73ab3c2092 Use future and do not block if reloading. add df47821123 Merge pull request #6789 from sdedic/maven/priming-and-reloads2 add b081810632 LSP: Using labelDetails in CompletionItems for better rendering in VSCode. add 46477fc680 Merge pull request #6904 from dbalek/dbalek/lsp-completion-label-details add df96b9bdb4 Copy Windows launcher sources back from https://github.com/apache/netbeans-native-launchers add b8e969aa0f Update paths and add workflow file to build native launchers. add 011c1cc518 Merge pull request #6869 from neilcsmith-net/windows-launchers add b391a63455 Drop special mimetype for karma test configuration add bd150719b9 Merge pull request #6883 from matthiasblaesing/javascript_config add 1a3bafbbfa Changelog update for VSNetBeans 20.0.301 add 561522ebad Merge pull request #6910 from MartinBalin/master add 24ba6df45f Fix the named argument code completion for constructors add d81235cc25 Merge pull request #6911 from junichi11/php-named-argument-cc-for-constructor add 326cef41f4 Fix incorrect code completion with the same member names as semi-type prefixes #6909
(netbeans) branch master updated: Fix incorrect code completion with the same member names as semi-type prefixes #6909
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 326cef41f4 Fix incorrect code completion with the same member names as
semi-type prefixes #6909
new 1b73a19f71 Merge pull request #6915 from
junichi11/php-gh-6909-incorrect-cc-with-type-method
326cef41f4 is described below
commit 326cef41f4f82b3d6280dc80a4826dedec70750e
Author: Junichi Yamamoto
AuthorDate: Thu Jan 4 20:50:32 2024 +0900
Fix incorrect code completion with the same member names as semi-type
prefixes #6909
- https://github.com/apache/netbeans/issues/6909
- To avoid conflicting with member names, add `-type` suffix to semi-type
prefixes because "-" can not be contained to member names
- Add unit tests
Example:
```php
class Example {
public function Type(): int {
return 0;
}
public function test(): void {
$this->Type()-> // before: Example members(`Type()`, `test()`) are
shown
// after : no items
}
}
```
---
.../php/editor/model/impl/VariousUtils.java| 22 ++--
.../testfiles/completion/lib/gh6909/gh6909.php | 86 +++
.../gh6909.php.testGH6909_FieldType01.completion | 6 ++
.../gh6909.php.testGH6909_Instance01.completion| 3 +
.../gh6909.php.testGH6909_Instance02.completion| 3 +
.../gh6909.php.testGH6909_Instance03.completion| 3 +
.../gh6909.php.testGH6909_Instance04.completion| 3 +
.../gh6909.php.testGH6909_Instance05.completion| 3 +
.../gh6909.php.testGH6909_Instance06.completion| 3 +
.../gh6909.php.testGH6909_Instance07.completion| 3 +
php.testGH6909_InstanceReturnType01.completion | 6 ++
php.testGH6909_InstanceReturnType02.completion | 6 ++
.../gh6909.php.testGH6909_Static01.completion | 3 +
.../gh6909.php.testGH6909_Static02.completion | 3 +
.../gh6909.php.testGH6909_Static03.completion | 3 +
.../gh6909.php.testGH6909_Static04.completion | 3 +
.../gh6909.php.testGH6909_Static05.completion | 3 +
.../gh6909.php.testGH6909_Static06.completion | 3 +
...09.php.testGH6909_StaticReturnType01.completion | 6 ++
...09.php.testGH6909_StaticReturnType02.completion | 6 ++
.../testPHP83TypedClassConstants.php.indexed | 2 +-
.../completion/PHPCodeCompletionGH6909Test.java| 117 +
22 files changed, 285 insertions(+), 11 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
index bd26a248fc..ca7cd2c704 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/VariousUtils.java
@@ -116,16 +116,18 @@ public final class VariousUtils {
public static final String PRE_OPERATION_TYPE_DELIMITER = "@"; //NOI18N
public static final String POST_OPERATION_TYPE_DELIMITER = ":"; //NOI18N
public static final String POST_OPERATION_TYPE_DELIMITER_SUBS = "_POTD_";
//NOI18N
-public static final String CONSTRUCTOR_TYPE_PREFIX = "constuct" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String FUNCTION_TYPE_PREFIX = "fn" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String METHOD_TYPE_PREFIX = "mtd" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String STATIC_METHOD_TYPE_PREFIX = "static.mtd" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String FIELD_TYPE_PREFIX = "fld" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String STATIC_FIELD_TYPE_PREFIX = "static.fld" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String STATIC_CONSTANT_TYPE_PREFIX = "static.constant"
+ POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String VAR_TYPE_PREFIX = "var" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String ARRAY_TYPE_PREFIX = "array" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
-public static final String TYPE_TYPE_PREFIX = "type" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
+// GH-6909 To avoid conflicting with member names, add "-type" suffix
+// because "-" can not be contained to member names
+public static final String CONSTRUCTOR_TYPE_PREFIX = "constuct-type" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
+public static final String FUNCTION_TYPE_PREFIX = "fn-type" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
+public static final String METHOD_TYPE_PREFIX = "mtd-type" +
POST_OPERATION_TYPE_DELIMITER; //NOI18N
+public static final String STATIC_METHOD_TYPE_PREFIX = "static.mtd-type" +
POST_OPERATION_TYPE_DELIMITER;
(netbeans) branch master updated: Fix the named argument code completion for constructors
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 24ba6df45f Fix the named argument code completion for constructors
new d81235cc25 Merge pull request #6911 from
junichi11/php-named-argument-cc-for-constructor
24ba6df45f is described below
commit 24ba6df45f395f1cbec9459526befa6f48345de9
Author: Junichi Yamamoto
AuthorDate: Wed Jan 3 16:33:13 2024 +0900
Fix the named argument code completion for constructors
- Show argument names in consturctors
- Don't add `:` if an existing name has `:` (an improvement)
e.g. ^maxLength: (^: caret)
We are unsure whether a user expects to add or override an item in this
context.
So, just add a name. (i.e. don't add ":")
This behavior is useful when the consuming completion(Ctrl +
Enter) is used.
- Add unit tests
---
.../editor/completion/CompletionContextFinder.java | 4 +-
.../php/editor/completion/PHPCodeCompletion.java | 79 --
.../php/editor/completion/PHPCompletionItem.java | 37 -
.../namedArgumentsConstructor01.php| 25 ++
php.testNamedArgumentsConstructor01.completion | 92 +
.../namedArgumentsConstructor02.php| 26 ++
...hp.testNamedArgumentsConstructor02_a.completion | 6 ++
...hp.testNamedArgumentsConstructor02_b.completion | 92 +
.../namedArgumentsConstructor03.php| 25 ++
php.testNamedArgumentsConstructor03.completion | 92 +
.../namedArgumentsConstructor04.php| 25 ++
php.testNamedArgumentsConstructor04.completion | 6 ++
.../namedArgumentsConstructor05.php| 26 ++
...edArgumentsConstructor05_Template01.cccustomtpl | 2 +
...edArgumentsConstructor05_Template02.cccustomtpl | 2 +
...hp.testNamedArgumentsConstructor05_a.completion | 92 +
...hp.testNamedArgumentsConstructor05_b.completion | 92 +
...hp.testNamedArgumentsConstructor05_c.completion | 6 ++
.../namedArgumentsConstructor06.php| 33
php.testNamedArgumentsConstructor06.completion | 96 ++
.../editor/completion/PHP80CodeCompletionTest.java | 46 +++
.../completion/PHPCodeCompletionTestBase.java | 13 +++
22 files changed, 888 insertions(+), 29 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
b/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
index 8babca1a2d..81c2724532 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/completion/CompletionContextFinder.java
@@ -235,7 +235,7 @@ final class CompletionContextFinder {
HTML, CLASS_NAME, INTERFACE_NAME, BACKING_TYPE,
TYPE_NAME, RETURN_TYPE_NAME, RETURN_UNION_OR_INTERSECTION_TYPE_NAME,
FIELD_TYPE_NAME, CONST_TYPE_NAME, VISIBILITY_MODIFIER_OR_TYPE_NAME, STRING,
CLASS_MEMBER, STATIC_CLASS_MEMBER, PHPDOC, INHERITANCE, EXTENDS,
IMPLEMENTS, METHOD_NAME,
-CLASS_MEMBER_PARAMETER_NAME, STATIC_CLASS_MEMBER_PARAMETER_NAME,
FUNCTION_PARAMETER_NAME,
+CLASS_MEMBER_PARAMETER_NAME, STATIC_CLASS_MEMBER_PARAMETER_NAME,
FUNCTION_PARAMETER_NAME, CONSTRUCTOR_PARAMETER_NAME,
CLASS_CONTEXT_KEYWORDS, SERVER_ENTRY_CONSTANTS, NONE, NEW_CLASS,
GLOBAL, NAMESPACE_KEYWORD,
GROUP_USE_KEYWORD, GROUP_USE_CONST_KEYWORD, GROUP_USE_FUNCTION_KEYWORD,
USE_KEYWORD, USE_CONST_KEYWORD, USE_FUNCTION_KEYWORD,
DEFAULT_PARAMETER_VALUE, OPEN_TAG, THROW, THROW_NEW, CATCH,
CLASS_MEMBER_IN_STRING,
@@ -1608,6 +1608,8 @@ final class CompletionContextFinder {
retval = CompletionContext.CLASS_MEMBER_PARAMETER_NAME;
} else if (acceptTokenChains(ts, STATIC_CLASS_MEMBER_TOKENCHAINS,
true)) {
retval = CompletionContext.STATIC_CLASS_MEMBER_PARAMETER_NAME;
+} else if (acceptTokenChains(ts, CLASS_NAME_TOKENCHAINS, true)) {
+retval = CompletionContext.CONSTRUCTOR_PARAMETER_NAME;
} else {
retval = CompletionContext.FUNCTION_PARAMETER_NAME;
}
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
index cc1039a784..4df5313c8a 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
@@ -57,6 +57,7 @@ import org.netbeans.modules.csl.spi.support.CancelSupport;
import
(netbeans) branch master updated: Changelog update for VSNetBeans 20.0.301
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 1a3bafbbfa Changelog update for VSNetBeans 20.0.301 new 561522ebad Merge pull request #6910 from MartinBalin/master 1a3bafbbfa is described below commit 1a3bafbbfaa7e8f90dc49eb7043aa5af75b3c5c9 Author: Martin Balin AuthorDate: Wed Jan 3 08:50:26 2024 +0100 Changelog update for VSNetBeans 20.0.301 --- java/java.lsp.server/vscode/CHANGELOG.md | 14 ++ 1 file changed, 14 insertions(+) diff --git a/java/java.lsp.server/vscode/CHANGELOG.md b/java/java.lsp.server/vscode/CHANGELOG.md index 311d3816c1..22f2aa2908 100644 --- a/java/java.lsp.server/vscode/CHANGELOG.md +++ b/java/java.lsp.server/vscode/CHANGELOG.md @@ -20,6 +20,20 @@ under the License. --> +## Version 20.0.301 +* Micronaut: + * Micronaut Expression Language added - Syntax highlighting, Code Completion, Go to Declaration + * Micronaut Controllers can be based on Repository interfaces to allow data access + * Pageable data Repositories added to New from Template multistep wizard +* Database and OCI: + * OCI Vault support for Database applications run in OKE + * Copy OCID for OCI resources + * Number of bug fixes & improvements +* Numerous LSP improvements & bug fixes +* Number of fixes and improvements in project management + * Priming build reload issues fixed + * Using selected launch config for F5 and code lenses + * and others... ## Version 19.0.301 * LSP: Micronaut Symbols recognized and shown in Find Symbol in VSCode - 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
