From dbf44701e43dec183422fb97c2bec788f0d40244 Mon Sep 17 00:00:00 2001
From: wurstsalat <mailtrash@posteo.de>
Date: Mon, 4 Jul 2022 12:35:15 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20CodeWidget:=20Don=E2=80=99t=20default=20?=
=?UTF-8?q?to=20python=20for=20highlighting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes #11012
---
gajim/gtk/conversation/code_widget.py | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/gajim/gtk/conversation/code_widget.py b/gajim/gtk/conversation/code_widget.py
index 56d46a5005..f1dbf281f1 100644
--- a/gajim/gtk/conversation/code_widget.py
+++ b/gajim/gtk/conversation/code_widget.py
@@ -13,7 +13,6 @@
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
from typing import Any
-from typing import Tuple
from typing import Optional
import logging
@@ -72,16 +71,16 @@ def _on_copy(self, _button: Gtk.Button) -> None:
def add_content(self, block: PreBlock):
code, lang = self._prepare_code(block.text)
- lang_name = self._textview.set_language(lang)
if lang is None:
self._lang_label.set_text(_('Code snippet'))
else:
+ lang_name = self._textview.set_language(lang)
self._lang_label.set_text(_('Code snippet (%s)') % lang_name)
self._textview.print_code(code)
@staticmethod
- def _prepare_code(text: str) -> Tuple[str, Optional[str]]:
+ def _prepare_code(text: str) -> tuple[str, Optional[str]]:
text = text.strip()
code_start = text.partition('\n')[0]
lang = None
@@ -127,15 +126,10 @@ def _on_style_changed(self, *args: Any) -> None:
if style_scheme is not None:
self.get_buffer().set_style_scheme(style_scheme)
- def set_language(self, language_string: Optional[str]) -> str:
- if language_string is None:
- language_string = 'python3'
-
+ def set_language(self, language_string: str) -> str:
lang = self._source_manager.get_language(language_string)
if lang is None:
- lang = self._source_manager.get_language('python3')
-
- assert lang is not None
+ return _('Unknown language')
log.debug('Code snippet lang: %s', lang.get_name())
self.get_buffer().set_language(lang)
--
GitLab