sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 00:38:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[language server] aquire lock in main thread, fixed syntax highlighting for keywords

Browse source
This commit is contained in:
Sven Efftinge 2016-06-07 15:48:04 +02:00
parent 66caca99ad
commit 17dd11ef23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/IEditorHighlightingConfigurationProvider.xtend
View file

@ -35,7 +35,7 @@ interface IEditorHighlightingConfigurationProvider {
[
«getStandardPatterns»
{
match: "\\\\b(?:«keywords.join('|')»)\\\\b",
match: "\\b(?:«keywords.join('|')»)\\b",
name: "keyword.«languageInfo.shortName»"
}
]

4
plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/concurrent/RequestManager.xtend
View file

@ -66,8 +66,8 @@ class RequestManager {
if (cancelIndicator instanceof CancellableIndicator)
cancelIndicators += cancelIndicator
semaphore.acquire(MAX_PERMITS)
return CompletableFuture.runAsync([
semaphore.acquire(MAX_PERMITS)
try {
writeRequest.apply(cancelIndicator)
} finally {
@ -100,8 +100,8 @@ class RequestManager {
if (cancelIndicator instanceof CancellableIndicator)
cancelIndicators += cancelIndicator
semaphore.acquire(1)
return CompletableFuture.supplyAsync([
semaphore.acquire(1)
try {
return readRequest.apply(cancelIndicator)
} finally {