summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpommicket <pommicket@gmail.com>2024-12-08 22:57:09 -0500
committerpommicket <pommicket@gmail.com>2024-12-08 22:57:09 -0500
commit146c517517f9a17d6ed9329cdbe84d89155a777e (patch)
tree7d3b7bc412a79f2cd133d14f318832212a8138fe
parent1687c0ae903d4d48abd5842520ec9fa7da3036d9 (diff)
Fix new LSP bug introduced by 2.7.5HEAD2.7.6trunk
-rw-r--r--README.md1
-rw-r--r--control2
-rw-r--r--ide-autocomplete.c2
-rw-r--r--main.c29
-rw-r--r--ted.h2
-rw-r--r--windows_installer/ted/ted.vdproj6
6 files changed, 21 insertions, 21 deletions
diff --git a/README.md b/README.md
index bab2d24..ea952ac 100644
--- a/README.md
+++ b/README.md
@@ -359,6 +359,7 @@ Then run `make.bat release`.
<tr><td>2.7.3</td> <td>configure data directories, set indentation manually</td> <td>2024 Sep 8</td></tr>
<tr><td>2.7.4</td> <td>find/replace and LSP bug fixes</td> <td>2024 Sep 8</td></tr>
<tr><td>2.7.5</td> <td>LSP bug fix</td> <td>2024 Dec 7</td></tr>
+<tr><td>2.7.6</td> <td>Fix new LSP bug introduced by 2.7.5</td> <td>2024 Dec 8</td></tr>
</table>
## License
diff --git a/control b/control
index e963535..72169e2 100644
--- a/control
+++ b/control
@@ -1,5 +1,5 @@
Package: ted
-Version: 2.7.5
+Version: 2.7.6
Section: text
Priority: optional
Architecture: amd64
diff --git a/ide-autocomplete.c b/ide-autocomplete.c
index 558b388..3ff138e 100644
--- a/ide-autocomplete.c
+++ b/ide-autocomplete.c
@@ -365,7 +365,7 @@ void autocomplete_process_lsp_response(Ted *ted, const LSPResponse *response) {
assert(0);
return;
}
- if (!lsp_response_is_error(response)) {
+ if (lsp_response_is_error(response)) {
autocomplete_close(ted);
ted_flash_error_cursor(ted);
return;
diff --git a/main.c b/main.c
index d02d044..bf34720 100644
--- a/main.c
+++ b/main.c
@@ -2,7 +2,6 @@
FUTURE FEATURES:
- more tests
- prepare rename support
-- custom file/build command associations
- config variables
- bind key to series of commands
- convert macro to command list
@@ -980,21 +979,21 @@ int main(int argc, char **argv) {
LSPResponse *r = &message.response;
if (!lsp_string_is_empty(r->error)) {
ted_log(ted, "LSP error: %s\n", lsp_response_string(r, r->error));
- // this is a bit spammy
- // sometimes clang is just like "this request was cancelled cuz the cursor moved"
- //ted_error(ted, "LSP error: %s", lsp_response_string(r, r->error));
- // it's important that we send error responses here too.
- // we don't want to be waiting around for a response that's never coming.
- autocomplete_process_lsp_response(ted, r);
- format_process_lsp_response(ted, r);
- signature_help_process_lsp_response(ted, r);
- hover_process_lsp_response(ted, r);
- definitions_process_lsp_response(ted, lsp, r);
- highlights_process_lsp_response(ted, r);
- usages_process_lsp_response(ted, r);
- document_link_process_lsp_response(ted, r);
- rename_symbol_process_lsp_response(ted, r);
}
+ // this is a bit spammy
+ // sometimes clang is just like "this request was cancelled cuz the cursor moved"
+ //ted_error(ted, "LSP error: %s", lsp_response_string(r, r->error));
+ // it's important that we send error responses here too.
+ // we don't want to be waiting around for a response that's never coming.
+ autocomplete_process_lsp_response(ted, r);
+ format_process_lsp_response(ted, r);
+ signature_help_process_lsp_response(ted, r);
+ hover_process_lsp_response(ted, r);
+ definitions_process_lsp_response(ted, lsp, r);
+ highlights_process_lsp_response(ted, r);
+ usages_process_lsp_response(ted, r);
+ document_link_process_lsp_response(ted, r);
+ rename_symbol_process_lsp_response(ted, r);
} break;
}
lsp_message_free(&message);
diff --git a/ted.h b/ted.h
index d44b06a..f35b27d 100644
--- a/ted.h
+++ b/ted.h
@@ -22,7 +22,7 @@ extern "C" {
#include "command.h"
/// Version number
-#define TED_VERSION "2.7.5"
+#define TED_VERSION "2.7.6"
/// Maximum path size ted handles.
#define TED_PATH_MAX 1024
/// Config filename
diff --git a/windows_installer/ted/ted.vdproj b/windows_installer/ted/ted.vdproj
index 2308cf5..5b0b1c9 100644
--- a/windows_installer/ted/ted.vdproj
+++ b/windows_installer/ted/ted.vdproj
@@ -620,15 +620,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:ted"
- "ProductCode" = "8:{D39A2AF9-21E8-4507-B208-DE4622876633}"
- "PackageCode" = "8:{05D88A98-CDA4-4288-84C0-C583AC359F3B}"
+ "ProductCode" = "8:{25D93CDD-B6DA-4513-8B4B-32D18F69906A}"
+ "PackageCode" = "8:{9805C6CC-3A83-4FDB-8023-C8B5B6B9E817}"
"UpgradeCode" = "8:{844F6C2B-DF3B-4A81-9BD5-603401BBA651}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:24.12.0800"
+ "ProductVersion" = "8:24.12.0900"
"Manufacturer" = "8:ted"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"