luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Résolution du conflit.

Browse source
This commit is contained in:
Benoît Minisini 2023-10-29 16:48:59 +01:00
commit 67d024b283
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
comp/src/gb.highlight/.icon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

2
comp/src/gb.highlight/.src/Main.module
View file

@ -13,7 +13,7 @@ Public Sub Main()
TextHighlighter.CanRewrite = True
'TextHighlighter["gambas"].Run(" \"CTRL+A\": \"SelectAll\",\n", aState)
'File.Save("~/test.html", TextHighlighter["html"].ToHTML(File.Load("test/page.html")))
'File.Save("~/test.html", TextHighlighter["c"].ToHTML(File.Load("~/gambas/git/master/main/share/gambas.h")))
File.Save("~/test.html", TextHighlighter["c"].ToHTML(File.Load("~/gambas/main/share/gambas.h")))
'File.Save("~/test.html", TextHighlighter["diff"].ToHTML(File.Load(Application.Path &/ ".hidden/test/diff.txt")))
'TextHighlighter.Register("~/gambas/git/master/app/src/gambas3/highlight/conflict.highlight")
'File.Save("~/test.html", TextHighlighter["conflict"].ToHTML(File.Load("test/conflict.txt")))

2
comp/src/gb.highlight/.src/TextHighlighter.class
View file

@ -278,7 +278,7 @@ Static Private Sub CreateCustomHighlighter(sHighlight As String, sPath As String
Shell "cd " & Shell$(sDir) & " && gba3 2>&1" To sOutput
sOutput = Trim(sOutput)
If Process.LastValue And If sOutput Then Error.Raise(sOutput)
Wait 0.1
Component.Load(sDir &/ "gb.highlight." & sHighlight & ".gambas")
Catch